quick fix
Merge branch 'master' of https://github.com/ChapmanCPSC370/adarkroom

Conflicts:
	script/engine.js