Merge pull request #2 from jrkirby/master

update
Update cardType.py
Update main.py
Update userinterface.py
merging