modifying checkout list
Merge branch 'master' of https://github.com/kevhui/Android-ShoppingApp

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/juan/shopping/MainActivity.class
	bin/classes/com/juan/shopping/R$id.class
	bin/classes/com/juan/shopping/R$layout.class
	bin/classes/com/juan/shopping/R$menu.class
	bin/classes/com/juan/shopping/R$string.class
	bin/classes/com/juan/shopping/R$style.class
	bin/resources.ap_
	gen/com/juan/shopping/R.java