Änderung in Zeile 14
Merge branch 'master' of https://github.com/kineese/uebung02a

Conflicts:
	trunk/gedicht.txt