neue strophe
Strophe hinzugefügt
neue strophe
Merge branch 'Zweig_A' of https://github.com/Lex999/SE2
Merge branch 'Zweig_B' of https://github.com/Lex999/SE2

Conflicts:
	trunk/gedicht.txt
Merge remote-tracking branch 'remotes/origin/Zweig_C'

Conflicts:
	trunk/gedicht.txt