bla
Merge branch 'master' of https://github.com/TUD-SE2-Gruppe7-2013/Uebung2a

Conflicts:
	trunk/gedicht.txt