Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
2 jobs for develop
Status Name Job ID Coverage
  Build
canceled build-clang #9119

canceled build-gcc #9118