map update
changed mergesMerge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	challange.html
	createTeam.html
	login.html
	signUp.html
fixed mereg error - kinda