blub
Merge branch 'master' of https://github.com/emeroez/hello-world

Conflicts:
	trunk/gedicht.txt