controller and routes
Merge branch 'master' of github.com:awongh/rainbowsomewhere

Conflicts:
	config/routes.rb