fixed #595

also added a couple new cards
Revert "fixed #595"

This reverts commit 3db077b9586c8305ffa53d02b3ac0675895050e6.
Merge pull request #598 from jlin14/master

Update