I created a conflict
Merge branch 'master' of https://github.com/anjakammer/lab3 into mergeFehler