refactor cards a little
Merge branch 'master' of github.com:bystam/settlers-js