Added header block to clock.h
Removed extraneous MSVS rubbish
Merge branch 'feature/whazzup' into develop
Merge branch 'develop' into feature/gui