Tiny bug fix for happiness scores.
Merge branch 'master' of https://github.com/jdl39/HappinessTracker

Conflicts:
	app/controllers/happiness_controller.rb