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

Conflicts:
	math.html
Revert "added jquery stuff"

This reverts commit 007f564fe05ba94c7a8601fb5e6e0822ef89937a.

Conflicts:
	math.html