Meal class now holds on to entire Food objects
Merge remote-tracking branch 'origin/master'

Conflicts:
	perfectmeal.py
'merging, bringing up to date'