Ich merge ...jetzt gleich?! ok gleich
Not this time merge conflict solved
Merge branch 'master' of https://github.com/anjakammer/lab3 into PascalsNeuerBranch
Erster
Merge remote-tracking branch 'origin' into PascalsNeuerBranch
Merge pull request #4 from anjakammer/PascalsNeuerBranch

Pascals neuer branch