rspec adventure
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon

Conflicts:
	app/controllers/home_controller.rb