Bugfix
Merge branch 'master' of https://github.com/anthonygego/UCL-SINF1225-GR4-Gourmet

Conflicts:
	Fooddroid/gen/com/fooddroid/R.java
	Fooddroid/res/values/strings.xml