Merge pull request #1 from lettergram/master

adds find index for cards
something
Merge branch 'master' of https://github.com/jrkirby/TD_Buildathon
Merge pull request #1 from jrkirby/master

request
Merge pull request #2 from barcute2/master

Merge pull request #1 from jrkirby/master
Create cardType.py
src
Merge pull request #4 from barcute2/master

src added
new files
Merge pull request #3 from barcute2/patch-1

Create cardType.py
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
menu works
Update card.py
Update userinterface.py
Update main.py

added music
card stuff
card stuff
Merge pull request #8 from lettergram/patch-3

Update main.py