Pantry view working
Merge branch 'master' of github.com:jacobjiggler/FoodMate

Conflicts:
	src/Android/app/src/main/res/values/strings.xml
Merge branch 'master' of github.com:jacobjiggler/FoodMate