P Änderungen
Merge branch 'master' of https://github.com/BeatriceFriess/qs into Zweig_A

Conflicts:
	trunk/gedicht.txt