Implemented more of the models, did all the querying to calculate a shopping list
Merge branch 'master' of github.com:jacobjiggler/FoodMate