my newest

since that local thing is irrelevant, I commented it out. I didn't
delete it so that maybe we can fix that later
Merge remote-tracking branch 'origin/master'

Conflicts:
	jquerytesting.html