Fix bugs on live server
Merge branch 'master' of https://github.com/somerandomsequence/food-rescue-robot

Conflicts:
	Makefile
Merge branch 'master' of https://github.com/somerandomsequence/food-rescue-robot
Ignore blank entries