jQuery
Merge branch 'master' of https://github.com/Xantosuex/1950MainProject

Conflicts:
	comp 1950 site project/script/script.js