Fixed stupid error
Merge branch 'master' of https://github.com/iegamejams/shiftgame
Merge branch 'master' of https://github.com/iegamejams/shiftgame
Merge branch 'master' of https://github.com/iegamejams/shiftgame

Conflicts:
	js/ui/Shape.js