Initial idea...maybe it would be better to put all the cards in the dict
simple string formatting
Merge branch 'master' into aso

Conflicts:
	deckparts.py
	simpledeck.py