Clock class is fixed and commented out
Merge branch 'master' of https://github.com/mtveter/TDT4190