Conflicts:
	app/models/project.rb
	config/routes.rb
	db/schema.rb