Updated objects.
Testing Game, Deck, Card
Pre-merge commit
To merge Ryan's code
To merge Ryan's code
Merging
Merge remote-tracking branch 'origin/cwilli13'