Changes to Deck class
Merge remote-tracking branch 'origin/Combined' into Combined