aktuelle version
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/SoftwareEngineering.apk
	bin/classes.dex
	bin/classes/com/example/softwareengineering/MainActivity.class
	bin/classes/com/example/softwareengineering/R$layout.class
	bin/classes/com/example/softwareengineering/R$menu.class
	bin/classes/com/example/softwareengineering/R$string.class
	bin/classes/com/example/softwareengineering/R$style.class
	bin/resources.ap_
	gen/com/example/softwareengineering/R.java
	res/layout/activity_main.xml
	res/layout/activity_usercode.xml
	res/values/strings.xml
	src/com/example/swetest/MainActivity.java
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering

Conflicts:
	README.txt