getting pulls yo
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
color palette now set in charprop. all pallets per character stored in paletteList. started CSCI B attack
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/Misc/MatchMaster.cs
CSCI B attack finally works!!! small bug with the text though, its duplicating letters for some reason
squashed it :D
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/CharacterStuff/CSCI/CompSci_char02.mb.meta