Fix adding jokers to the card deck
Merge branch 'master' into test