Add COLORS, Player and Type.
Merge remote-tracking branch 'origin/master'