Added timer tasks and stuff
Merged

Merge branch 'master' of https://github.com/leils/cpe102