Merged together most up-to-date versions.
Merge branch 'master' of https://github.com/jcrabtree1/TimeClock