Add 4 lines from Mephisto
Vier Zeilen Unsinn
Merge branch 'Zweig_A' of https://github.com/kineese/uebung02a
Merge branch 'Zweig_C' of https://github.com/kineese/uebung02a

Conflicts:
	trunk/gedicht.txt