Search!
Merge branch 'master' of github.com:hochbergg/kitchencrashers

Conflicts:
	kitchencrashers/templates/index.html