updates
Merge branch 'master' of https://github.com/jonallenaz/first-repository
ractive timer updates