c Behebt 3 Fehler
Merge branch 'master' of https://github.com/alexsee/se-1314-2a
DELETE IT
Revert "DELETE IT"

This reverts commit 26392b1f897127f23053176be5b940fa3dddc613.
zeile added
ändern
neue strophe
simon der poet
Merge remote-tracking branch 'remotes/origin/Zweig_B'

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

Conflicts:
	trunk/gedicht.txt
Merge branch 'master' of https://github.com/alexsee/se-1314-2a