Some discardable local changes
Recieved new features
Merge branch 'master' of https://github.com/TiddoLangerak/Context-groep-3
Moved the timer of the setting of the screen to worldBehaviour