Refactored Timer class
Merge branch 'tdd-restart' of github.com:mattiskan/novia into tdd-restart