Did some work on load/save game
Merge branch 'origin/gh-pages'