csci now has green text for palette 2, also he has teh hurtboxes now. grabbing yo pulls right now chris
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
added down ground for csci
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/CharacterStuff/CSCI/CSCI_BackAir.cs
	Assets/CharacterStuff/CSCI/CSCI_ForwardAir.cs