added the creation & shuffling of the game cards.
fixed conflicts during merge.
more merge fixes and changed 'Color' to 'Colour'.