Reworking cards
Merge branch 'master' of github.com:fourofour/wittl