9.
Merge branch 'master' of https://github.com/Sammy5689/SE

Conflicts:
	trunk/gedicht.txt