Correct explosion
Merge branch 'master' of https://github.com/zachanima/catbox

Conflicts:
	pixelscratch/Player.js