Added total score and disaster count fields to player.
merged conflicts