update
SLIDER UPDATE
Merge branch 'gh-pages' of https://github.com/tysone/2014-columbia-projects into gh-pages

Conflicts:
	Priyanka_Gupta/FINAL PROJECT/untitled folder/final.css
update