added jquery

added jquery
Merge remote-tracking branch 'origin/master'

Conflicts:
	canvas.html