first commit - seems to work fine
Merge branch 'master' of github.com:dubsteph/clock