Deck values not Hardcoded + cleared warnings
Merge remote-tracking branch 'origin/Moore' into Combined