deleting is back
Merge branch 'master' of http://github.com/teamsnowman/hextris

Conflicts:
	js/main.js
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages