fixed ordering of scoreboard at end of game. Added player colors to scoreboard
merge commit