Merge branch 'master' of https://github.com/Blumss/TestProjekt

Conflicts:
	app/src/main/java/com/pemws14/testproject/MainActivity.java