merge seems to work
Merge branch 'master' of https://github.com/LaurenDM/Pen0--Computerwetenschappen-Groen into koensbranch
Merge branch 'koensbranch' of https://github.com/LaurenDM/Pen0--Computerwetenschappen-Groen
Merge branch 'master' of https://github.com/LaurenDM/Pen0--Computerwetenschappen-Groen
Team-communicatie over doolhof nu volledig. Moet getest worden.