Merge branch 'master' of github.com:Atrament666/timer
Update license headers
Merge branch 'master' of github.com:Atrament666/timer