Adding some stuff
Merge branch 'master' of https://github.com/lisagumerman/thesis

Conflicts:
	index.html
Adding additional styles.  Finishing up popup stuff
Merge branch 'master' of https://github.com/lisagumerman/thesis
Adding css
Merge branch 'master' of https://github.com/lisagumerman/thesis

Conflicts:
	index.html
	js/main.js