Timer now writes 0 when timer hits 0
Merge branch 'master' of github.com:ChrisHermann/test2