rollback
Merge branch 'gh-pages' of https://github.com/angiebird/SMG_Platform into gh-pages

Conflicts:
	game.html