updating timer
Merge pull request #3 from eprogramming/master

updating timer