Fehler 3 behoben
Merge branch 'master' of https://github.com/BeatriceFriess/qs

Conflicts:
	trunk/gedicht.txt