mal schauen
Merge branch 'master' of https://github.com/DaSteph/testGIT.git

Conflicts:
	test.txt