drawable
Merge remote-tracking branch 'origin/master'

Conflicts:
	CardApp/bin/BusinessCardExchager.apk
	CardApp/bin/classes.dex

	CardApp/bin/classes/com/example/businesscardexchager/EditCardActivity.class
	CardApp/bin/classes/com/example/businesscardexchager/FragmentB.class
	CardApp/bin/classes/com/example/businesscardexchager/MainActivity.class
	CardApp/bin/classes/com/example/businesscardexchager/R$id.class
	CardApp/bin/classes/com/example/businesscardexchager/R$layout.class
	CardApp/bin/classes/com/example/businesscardexchager/R$menu.class
	CardApp/bin/classes/com/example/businesscardexchager/R$string.class
	CardApp/bin/resources.ap_