Merge branch 'master' of https://github.com/jcrabtree1/TimeClock
Merge branch 'master' of https://github.com/jcrabtree1/TimeClock