finished slideshow
Merge branch 'master' of https://github.com/elsp/doorknob
Merge branch 'master' of https://github.com/elsp/doorknob

Conflicts:
	startAdventure.html