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
broken control token
Merge branch 'websockets' of github.com:shelf/untitled into new
cleaned code?
bad race-condition style control token
Merge branch 'new' into websockets
added clear to canvas
Merge branch 'websockets' of github.com:shelf/untitled into websockets

Conflicts:
	backend/game.py
	backend/static/js/canvas.js
countdown timer for round length
loads full image state on client load
merged
server username registration
basic player join form
Merge remote-tracking branch 'origin/usernames' into websockets
working player name submission
join form works
rudimentary unsafe chat
chat fixes