Draws
Merge branch 'master' of https://github.com/oenix/danstabulle

Conflicts:
	NodeJS/public/javascripts/draws/canvas1.png