merged changes from in-progress game
Merge branch 'master' into gh-pages