- added timer to game page
Merge origin/master