Added a lot of stuff to food_info.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/food_info.json