Zweite (locale) Änderung
Merge branch 'master' of https://github.com/martin3421/helloworld

Conflicts:
	test.txt