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

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