Dev Commit

Updated and tested Card and CardComp class, start to work on adding
CardComp to CardSet.