Timer can now be turned off, on. #29
Merge branch 'dev' into thomas_dev