Fixing up the timer
Merge branch 'master' of https://github.com/jdgarvey/crossfit-soul