moved the shuffling of the discard pile back into the deck to a more logical place in the game loop