simplified the timer
Merge branch 'master' of github.com:deanmarsinelli/GameProject