fixed up
https://github.com/ndrake/PuzzleScript/commit/de4ac2a38865b74e66c1d711a25f0691079a290d
Merge branch 'master' of https://github.com/increpare/PuzzleScript

Conflicts:
	js/addlisteners.js
	js/editor.js
	js/toolbar.js