fix on canvas
Merge branch 'jt-fix-oncanvas'

Conflicts:
	assets/css/screen.css
	index.html