Solved timer issue
here goes nothin
Merge pull request #40 from pcs-groupProject/kellen

Kellen