still trying to merge both codes manually
just in case
integrating my UI (better xml better classes for views)
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git