Fixing styles, added slider stuff
Merge branch 'master' of https://github.com/lisagumerman/thesis

Conflicts:
	index.html