Changes to shuffle  for cleanness and removal of the cardsInDeck fuction

The if statement preceding the do-while loop was removed because it was
checking for a condition that was always true. I changed it to a while
loop to make that more clear.