Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb