recent changes to cindy
Merge branch 'master' of https://github.com/faintpixel/Drawbot

Conflicts:
	drawbot.js