Update routes file

Conflicts:
	config/routes.rb
whitespace