Committing and preparing to merge with master.
CardCollection added as well as several subclasses