Merge pull request #144 from polynickglot/master

Clock now works - Fix merge conflicts
Merge pull request #145 from polynickglot/master

Remove no longer used file