gotta get pulls yo
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/CharacterStuff/CSCI/CSCI_DashAttack.cs
	Assets/CharacterStuff/CSCI/CSCI_UpGround.cs
	Assets/CharacterStuff/CharacterProperties.cs
	Assets/CharacterStuff/HurtboxScript.cs
fixed text bugs with CSCI B
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/CharacterStuff/CSCI/CSCI_B_Behavior.cs
added AssignPalette() to charProp. get on my color level bro