Nick fixes the clock collision detection
Merge branch 'master' of https://github.com/ndm4766/SmartStroke.git