Mergekonflikt, hab nichts geändert soll trotzdem pushen
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git