js slider changes
Merge branch 'master' into coltonbranch

Conflicts:
	pizza.js
html slider changes
Merge branch 'master' into coltonbranch