Fixed pretty dumb timer bug
Merge branch 'master' of github.com:timothyhahn/inquizition-web