fixed pop functions

deck and discard pile  pop functions now remove the top card from the
deck or discard pile in addition to returning it.  deck pop now shuffles
all cards from the discard pile except for the top one back into the
deck if the deck is empty.
fix it now plz