no message
Merge branch 'master' of https://github.com/brunopp/4semesterAndroid

Conflicts:
	src/com/example/kodetilkunde/MainActivity.java