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 2 minutes and 31 seconds
Status Name Job ID Coverage
  Build
passed build-clang #8752

00:01:17

passed build-gcc #8751

00:01:13