Konflikt
Test Ende
Merge branch 'master' of https://github.com/ATLASsoft/SoPra.git
Nochmal commiten