new files
dammit
Merge branch 'master' of https://github.com/barcute2/TD_Buildathon into barcute2-master
Merge branch 'master' of https://github.com/jrkirby/TD_Buildathon

Conflicts:
	cardType.py