Before adding Rebeccas stuff
Before push
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	HealthyFoodFinder/bin/HealthyFoodFinder.apk
	HealthyFoodFinder/bin/R.txt
	HealthyFoodFinder/bin/classes.dex
	HealthyFoodFinder/bin/classes/com/example/healthyfoodfinder/Database.class
	HealthyFoodFinder/bin/classes/com/example/healthyfoodfinder/MapActivity.class
	HealthyFoodFinder/bin/classes/com/example/healthyfoodfinder/R$id.class
	HealthyFoodFinder/bin/dexedLibs/google-play-services_lib-2ac5a803ed267163ed5379274dfe1402.jar
	HealthyFoodFinder/bin/resources.ap_
	HealthyFoodFinder/gen/com/example/healthyfoodfinder/R.java
	HealthyFoodFinder/project.properties
	HealthyFoodFinder/src/com/example/healthyfoodfinder/Database.java
	HealthyFoodFinder/src/com/example/healthyfoodfinder/MapActivity.java