refactored card to work with new data. Still working on modal
fixed merge conflicts
Merge pull request #55 from darrelljones13/card-modal

refactored card to work with new data. Still working on modal