log d weggehaald
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.class
	CardApp/bin/classes/com/example/businesscardexchager/MyAdapter.class
	CardApp/bin/resources.ap_
	CardApp/src/com/example/businesscardexchager/MainActivity.java