Finished refactoring, fixed addCard()

CardCount is flyweight, and addCard() in Deck works better