hab auch was dazu geschrieben
Merge remote-tracking branch 'origin/master'

Conflicts:
	MesutsText.txt
Merge branch 'master' of https://github.com/webhippie/test

Conflicts:
	MesutsText.txt
hallo
Merge branch 'master' of https://github.com/webhippie/test

Conflicts:
	MesutsText.txt
Merge branch 'master' of https://github.com/webhippie/test