even test
test
test
tekst verwijderd
v0.1
test voor renier
test weg renier
v0.2
test
update
merge met renier commit
Merge remote-tracking branch 'origin/Renier' into Dennis

Conflicts:
	Common/bin/AndroidManifest.xml
	Common/bin/Common.apk
	Common/bin/classes.dex
	Common/bin/classes/com/example/common/MainActivity.class
	Common/bin/resources.ap_
	Common/gen/com/example/common/R.java
	Common/src/com/example/common/MainActivity.java
sync met renier
update
Merge branch 'Renier' into Dennis

Conflicts:
	Common/bin/Common.apk
	Common/bin/classes.dex
	Common/bin/dexedLibs/android-support-v4-f61e16243aee9b2b593a8007e275ead7.jar
	Common/bin/resources.ap_
	Common/gen/com/example/common/R.java
Bedrijvenlijst toegevoegd.
Grote wijzigingen in het de bedrijvenlijst. Beschrijving toegevoegd aan
de SingleListActivity.
Merge remote-tracking branch 'origin/master' into Dennis

Conflicts:
	Common/bin/AndroidManifest.xml
	Common/bin/classes/com/example/common/MainActivity.class
	Common/bin/classes/com/example/common/R$drawable.class
	Common/bin/classes/com/example/common/R$id.class
	Common/bin/classes/com/example/common/R$layout.class
	Common/bin/classes/com/example/common/R$menu.class
	Common/bin/classes/com/example/common/R$string.class
	Common/bin/classes/com/example/common/R$style.class
	Common/gen/com/example/common/R.java
	Common/res/layout/activity_main.xml
	Common/res/values/strings.xml
	Common/src/com/example/common/MainActivity.java
Nieuwe klassen toegevoegd voor de listview (bedrijvenlijst)
Merge rechtzetten