fixing things hopefully
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/2d stuff/Resources/Materials.meta
	Assets/2d stuff/Resources/Materials/1C Grid.mat
	Assets/2d stuff/Resources/Materials/1C Grid.mat.meta
	Assets/2d stuff/Resources/Materials/Materials.meta
	Assets/2d stuff/Resources/Materials/bluegsas.mat
	Assets/2d stuff/Resources/Materials/bluegsas.mat.meta
	Assets/2d stuff/Resources/Materials/redgsas.mat
	Assets/2d stuff/Resources/Materials/redgsas.mat.meta
	Assets/CharacterStuff/CSCI/Resources.meta
	Assets/CharacterStuff/CSCI/Resources/Materials.meta
	Assets/CharacterStuff/GSAS/Resources/1C Grid.mat
	Assets/CharacterStuff/GSAS/Resources/1C Grid.mat.meta
	Assets/CharacterStuff/GSAS/Resources/Materials.meta
	Assets/CharacterStuff/GSAS/Resources/Materials/1C Grid.mat
	Assets/CharacterStuff/GSAS/Resources/Materials/1C Grid.mat.meta
	Assets/CharacterStuff/GSAS/Resources/Materials/Materials.meta
	Assets/CharacterStuff/GSAS/Resources/Materials/bluegsas.mat
	Assets/CharacterStuff/GSAS/Resources/Materials/bluegsas.mat.meta
	Assets/CharacterStuff/GSAS/Resources/Materials/redgsas.mat
	Assets/CharacterStuff/GSAS/Resources/Materials/redgsas.mat.meta
	Assets/CharacterStuff/GSAS/Resources/bluegsas.mat
	Assets/CharacterStuff/GSAS/Resources/bluegsas.mat.meta
	Assets/CharacterStuff/GSAS/Resources/redgsas.mat
	Assets/CharacterStuff/GSAS/Resources/redgsas.mat.meta