Timer implemented
Timers working
Merge pull request #2 from jonatantierno/timer

Timer