game logic working again!
Merge branch 'master' into gh-pages

Conflicts: