initial commit
Merge branch 'master' of https://github.com/MobileAndroidDevelopment/Uebung1

Conflicts:
	.gitignore