Timer finished + tested
Smart timer
Merge branch 'master' of https://github.com/TomDeGroote/Bachelorproef