DiscardCardInDeckAtIndex tested
merge conflicts fixed