timer map
Merge branch 'serverCleanUp' of https://github.com/olafmaas/contextprojectgroep6 into serverCleanUp