Working.
Merge branch 'master' of https://github.com/iegamejams/shiftgame

Conflicts:
	shift.htm