dir
merge

Conflicts:
	web/home.html
	web/static/canvas.js