fix reset game logic, add game timer

merge master into gh-pages