better routes file

Conflicts:
	config/routes.rb
migrated
test user