+Card class
Merge remote-tracking branch 'origin/master'
+Deck class
Merge remote-tracking branch 'origin/master'