jquery file rather than link that chrome hates
Merge remote-tracking branch 'origin/master'

Conflicts:
	pingpong.html