Implements clock properly
Merge branch 'master' of https://github.com/NoZip/ParkerProject
Merge branch 'master' of https://github.com/NoZip/ParkerProject