initial
Merge branch 'master' of https://github.com/lt-dan/SWE2-EX2

Conflicts:
	gedicht.txt