dit gaat merge conflicten geven
mergemaster
Merge branch 'master' of https://github.com/jan-vandorpe/mctesting.git into mergemaster
aanpassingen na test met Jan
Merge branch 'master' of https://github.com/jan-vandorpe/mctesting.git into mergemaster