Merge branch 'gh-pages' of https://github.com/00s/lorn into gh-pages

Conflicts:
	Scripts/game.js
Merge branch 'gh-pages' of https://github.com/00s/lorn into gh-pages