Added color tracking to game
Merged