Style fixes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge Fix
Merge branch 'master' of https://github.com/FoodManagmentApp/MainProject

Conflicts:
	index.html