Fruitdb completed
fruitdb again
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	HealthyFoodFinder/src/com/example/healthyfoodfinder/MainActivity.java