Rip dialogue
Fix some typos
Finish dialogue
Merge branch 'rip' of https://github.com/rswang/cholera-crossing

Conflicts:
	public/javascripts/MayorDialogueState.js
Update feature descriptions
Update feature descriptions
Fix merging mistakes :(
Fixed docotr/mayor end game condition
Merge branch 'fixed' of https://github.com/rswang/cholera-crossing into fixed