Aenderung Zeile 14
Merge branch 'master' of https://github.com/Sammy5689/SoftwareEngineeringIIExercise03Repo

Conflicts:
	trunk/gedicht.txt
9.