Merge pull request #6 from mchannon/master

#5- Dealing, Display
Merge pull request #7 from mchannon/5

Merge pull request #6 from mchannon/master