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

Conflicts:
	public/javascripts/MayorDialogueState.js