flexslider things and other stuff
Merge branch 'master' of https://github.com/lisagumerman/thesis

Conflicts:
	js/main.js