C
Merge branch 'master' of git@github.com:colombo77c/HealthyFoodFinder.git

Conflicts:
	HealthyFoodFinder/bin/HealthyFoodFinder.apk
	HealthyFoodFinder/bin/classes.dex
	HealthyFoodFinder/bin/classes/com/example/healthyfoodfinder/MainActivity.class
Merge branch 'master' of git@github.com:colombo77c/HealthyFoodFinder.git
Final commit