Game is sized to window
Merge branch 'master' into gh-pages