new_features
new

Conflicts:
	bin/ExFood.apk
	bin/classes.dex
	bin/classes/com/example/androidhive/AllProductsActivity$1.class

	bin/classes/com/example/androidhive/AllProductsActivity$LoadAllProducts$1.class

	bin/classes/com/example/androidhive/AllProductsActivity$LoadAllProducts.class
	bin/classes/com/example/androidhive/AllProductsActivity.class
	bin/classes/com/example/androidhive/MainScreenActivity.class
	bin/resources.ap_
	src/com/example/androidhive/AllProductsActivity.java
	src/com/example/androidhive/MainScreenActivity.java