Calorie Intake Goal Started
Merge remote-tracking branch 'origin/master'

Conflicts:
	EatSmart/gen/edu/harding/android/eatsmart/R.java