added history
fixed merge conflict
added bin/
version for demo
changed add meal to popup, added history
Merge remote-tracking branch 'origin/demo' into shasha

Conflicts:
	gen/edu/ucsb/cs/cs185/FoodTracker/R.java
	res/values/strings.xml