addCard() removeCard() overhaul

And fixed discardStackBecomesDeckStack()