Zeile 3
Merge branch 'master' of github.com:frankkoenigstein/GitTest

Conflicts:
	SomeText.txt