Merge branch 'Laurin4'
Enigma angepasst
Merge branch 'master' of https://github.com/GDIProjekt/GDIProjekt.git
Merge branch 'Laurin4'
Merge branch 'master' into Laurin4