On branch master
 Corrected some diff stuff stuck in the code from a merge
	modified:   config/routes.rb