Hallo1
Merge branch 'master' into zweig2

Conflicts:
	Hallo.txt
Merge branch 'master' of https://github.com/Merglasch/4142Sopra