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
nike-orange
Merge branch 'master' of https://github.com/elsp/doorknob
Merge braniis ch 'master' of https://github.com/elsp/doorknob
moved hr down
Merge branch 'master' of https://github.com/elsp/doorknob
problem
nike-orange
add better fake event names
Merge branch 'master' of https://github.com/elsp/doorknob
fixed login img
added clues
merge conflcitMerge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	map.html
resolved conflict
image of nike swoosh

nuff