Finetuning search.
Merge branch 'master' of https://github.com/jdl39/HappinessTracker

Conflicts:
	app/assets/javascripts/application.js