Changeed base.html
Started working on search templates (client)
Merge branch 'master' of https://github.com/jordangedney/pantry

Conflicts:
	app/__init__.py
	app/views.py