merge conflicts
small changes on nike out and about
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