Merge branch 'master' of https://github.com/mushon/drawingbiennial

Conflicts:
	playground/index.html
	playground/style.css
Resolved