Revert "Merge branch 'master' of https://github.com/Fritsen/02312_CDIO3"

This reverts commit 714f26675079530635aeed5ad1e1e2e13f5dfc24.