Some stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	HealthyFoodFinder/gen/com/example/healthyfoodfinder/R.java