better input
Merge branch 'master' of http://github.com/teamsnowman/hextris into gh-pages

Conflicts:
	js/main.js