user timers working
Merge branch 'master' of https://github.com/talkingstick/repo