linking to slideshow
slideshowMerge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	startAdventure.html
Merge branch 'master' of https://github.com/elsp/doorknob
merge conflicts
fixed merge error
small changes on nike out and about
added style and fixed problem
slideshow images
updated slideshow images
map update
updated map images
made index.html and more
made buttons green
Merge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	signUp.html
	startAdventure.html
remove uneed image
merge conflictMerge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	signUp.html
merge conflict
reduced padding on time bar
added margin to li in maps.html
changes`