wip
Merge branch 'master' into death-order-matters

Conflicts:
	game-core/GameState.cpp
wip, waiting on bug fix
Merge branch 'master' into death-order-matters

Conflicts:
	game-core/GameState.cpp
Merge pull request #40 from 5-second-rule/death-order-matters

Death order matters