cleaned up folders, made a platforms layer so each scene is changed,  preliminary  collision fixes
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/CharacterStuff/GSAS/GSASPrefab2.prefab
incorporated new Dair
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage2/Test Stage 2.unity
	Assets/CharacterStuff/GSAS/GSASPrefab1.prefab
	Assets/Misc/MatchMaster.cs
halfway through collision update, need chris's palette change update
Wow holy moley this is going to be like my biggest push ever. new collision system and 2D Effect.  wow still reading this? loser
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/2d stuff/AttackSprites/RedStrike.anim.meta
	Assets/2d stuff/AttackSprites/RedStrike1_40fps_10frames_202x188_strip10_0.controller
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/Arenas/TestStage2/Test Stage 2.unity
	Assets/CharacterStuff/GSAS/GSASAnimatorController.controller.meta
	Assets/CharacterStuff/GSAS/GSASPrefab.prefab
	Assets/CharacterStuff/GSAS/GSASPrefab1.prefab
	Assets/ControllerManager.prefab.meta
	Assets/Menu Scripts/Help.cs
	Assets/Menu Scripts/MenuPage.cs
	Assets/Misc/gameControl.cs
	ProjectSettings/InputManager.asset