Adds edit mode

Binds to onkeyup instead of onkeypress for special keys
Merge branch 'edit-mode'

Conflicts:
	canvas.html
Merge branch 'master' into gh-pages