Tests likely complete (pending final review)
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git