cleaned up alerts
changed logo dimensions
Merge branch 'master' of https://github.com/ysugiant/grubber

Conflicts:
	Grubber/res/layout/activity_new_food.xml