minor edits
Merge branch 'master' of github.com:shelf/untitled into new

Conflicts:
	backend/static/js/canvas.js
	backend/templates/index.html
colours and brush widths
Merge branch 'websockets' of github.com:shelf/untitled into new
cleaned code?
Merge branch 'new' into websockets