forced commit
Merge branch 'master' of https://github.com/MyroStadler/clumpy

Conflicts:
	js/clumpy/canvas/CanvasSprite.js
	proof-clumpy-canvas-CanvasSprite.html