initial timer stuff
merge conflict
Merge branch 'master' into feature/projector-timer
more timer polish, still not passing event properly
fixed timer
Merge pull request #11 from ieundhdyjfawbb/feature/projector-timer

Feature/projector timer