clean up conflicts history
Merge branch 'master' of github.com:MrJack91/controlledClock
Merge branch 'master' of github.com:MrJack91/controlledClock