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 56 seconds (queued for 4 minutes and 38 seconds)
Status Name Job ID Coverage
  Build
passed build-clang #8802

00:02:32

passed build-gcc #8801

00:02:24