base layout
Merge branch 'master' of https://github.com/White0ut/PantryTracker

Conflicts:
	app/app.iml