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 4 minutes and 36 seconds (queued for 3 minutes and 18 seconds)
Status Job ID Name Coverage
  Build
passed #9065
build-clang

00:02:16

passed #9064
build-gcc

00:02:19