merge fixes
Merge branch 'master' of https://github.com/LaurenDM/Pen0--Computerwetenschappen-Groen