vi
Merge branch 'master' of https://github.com/atweb-project/test_assignment

Conflicts:
	functionTest/canvas/paint.html