Fix font-size and end of game
Merge branch 'develop' into gh-pages

* develop:
  Fix font-size and end of game