Fixed draw() so that card is returned after empty deck is re-filled from discard pile