Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
2 jobs for develop in 7 minutes and 34 seconds (queued for 3 minutes and 21 seconds)
Status Job ID Name Coverage
  Build
passed #9142
build-clang

00:02:47

passed #9141
build-gcc

00:04:46