Merge pull request #6 from aedwards12/timersetup

working timer that counts up
timer can now countdown
Merge remote-tracking branch 'upstream/master' into timersetup