Things
Merge branch 'master' of https://github.com/kpx/fridgify

Conflicts:
	fridgify-app/js/search.js