Adding jQuery Sliders and resolving some conflicts.
Merge branch 'master' of https://github.com/AttilaTheFun/Term-Project

Conflicts:
	assignment2/Assignment2.html