Merge branch 'master' of https://github.com/Pieter12345/Minor-Software-Ontwerpen-project
Merge branch 'master' of https://github.com/Pieter12345/Minor-Software-Ontwerpen-project