first commit
Merge https://github.com/joepegler/timer