CSCI buffed
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/CharacterStuff/CSCI/CSCIPrefab.prefab
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/New Terrain.asset
poop
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo