made some changes on the slideshow
changesMerge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	css/master.css
added master css back
fixed margin at bottom of page
finished linking signin button
changed styling on adventure table
Merge branch 'master' of https://github.com/elsp/doorknob
Merge branch 'master' of https://github.com/elsp/doorknob