try

test
Merge branch 'master' of https://github.com/Yunkou/startHtml5

Conflicts:
	canvas/E7.html