Merge branch 'master' of https://github.com/BusinesscardExchager/Eric-Maikel

Conflicts:
CardApp/bin/BusinessCardExchager.apk
CardApp/bin/resources.ap_
fragment a
Merge branch 'master' of https://github.com/BusinesscardExchager/Eric-Maikel

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

CardApp/bin/classes/com/example/businesscardexchager/MainActivity$1.clas
s
	CardApp/bin/classes/com/example/businesscardexchager/MainActivity.class
	CardApp/bin/resources.ap_