Merge branch 'master' into gh-pages
Fixed a bug where the game wouldn't save
Merge branch 'master' into gh-pages
Removed line that I meant to remove earlier

It makes no sense in its current context.