Dev branch

Prefer `contains?` over `has_card?`