added a timer
Merge branch 'master' of https://github.com/elsp/doorknob
Merge branch 'master' of https://github.com/elsp/doorknob
got animation working for fade
tread-logo
made a text timer
tread-logo-2
tread-logo-2
Merge branch 'master' of https://github.com/elsp/doorknob
added js timer and logo
updated structure
link to challange.htlm
added some icons for share
Merge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	.gitignore
minor updates to slideshow
linked pages
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
Icon Updates