Gemerged ipv gemergd
Merge branch 'master' of https://github.com/CanvasHS/Verslag