yay people are dying
Merge branch 'dev' of https://github.com/Cholera-Infrastructure-Game/CholeraGame into dev

Conflicts:
	src/game/main.js