Wichtige Änderung
123
456
Vom Flori
Merge branch 'master' of https://github.com/mgur/hase

Conflicts:
	README.md
new file hallo_welt.txt added
Merge remote-tracking branch 'remotes/origin/dertollebranch' into holpan
Merge branch 'master' of github.com:mgur/hase
sollte in branch sein
jetzt ein commit
foo
Merge branch 'testbranch' of github.com:mgur/hase into testbranch