html pause
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages

Conflicts:
	index.html