neuer konflikt
Merge branch 'master' of https://github.com/fgse-student-c/git-workshop-base

Conflicts:
	konflikt-hier.txt