Merged with master branch

conflicts:
    gamestate.js
    head-game.html