buttons veraendert
Merge branch 'master' of https://github.com/MobileAndroidDevelopment/Uebung1

Conflicts:
	.gradle/1.7/taskArtifacts/fileHashes.bin
	.gradle/1.7/taskArtifacts/fileSnapshots.bin
	.gradle/1.7/taskArtifacts/taskArtifacts.bin
	Uebung1/src/main/res/layout/activity_main.xml