Fix merging mistakes :(
Merge branch 'master' of https://github.com/rswang/cholera-crossing

Conflicts:
	public/javascripts/MayorDialogueState.js