making sure all changes are up
Merge pull request #11 from oconn/deck_card_views

making sure all changes are up