Merge pull request #19 from brain-murphy/connorbranch

Connorbranch
fixed timer task. Its alive
merge