verder gewerkt aan de app, zit nog wel fouten in.
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/classes/com/example/businesscardexchager/MyAdapter.class
	CardApp/bin/classes/com/example/businesscardexchager/R$color.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/classes/com/example/businesscardexchager/R$style.class
	CardApp/bin/classes/com/example/businesscardexchager/R.class
	CardApp/bin/resources.ap_
	CardApp/gen/com/example/businesscardexchager/R.java
	CardApp/res/layout/activity_edit_card.xml
	CardApp/res/layout/fragment_a.xml
	CardApp/res/values/strings.xml
	CardApp/src/com/example/businesscardexchager/MainActivity.java