versuch1
Merge branch 'master' of https://github.com/Doppelherz/melovi

Conflicts:
	test.txt