WTF
Merge branch 'master' of https://github.com/FoodManagmentApp/MainProject

Conflicts:
	index.html