Nothing interesting, commit to merge
Merge
msc
Merge branch 'development' of https://github.com/olafmaas/contextprojectgroep6.git into development