Several changes, mainly getting display of cards working
Merge pull request #3 from davidamoen/develop

Several changes, mainly getting display of cards working