committing stuff so that I can pull (hitboxes can be set to visible)
added if(!paused) to update functions
trying to make things work
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/CharacterStuff/AllStandardBehaviors/A_AttackBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/B_AttackBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/CharacterBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/DashBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/DashStartUpBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/DashingBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/FallingBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/GoingUpBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/GroundJumpBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/HitLagBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/HitStunBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/LandingBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/MenuBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/RecoveryBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/ShieldBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/ShieldRaiseBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/ShieldingBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/SlideBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/StoppingBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/TurnAroundBehavior.cs
	Assets/CharacterStuff/AllStandardBehaviors/WalkBehavior.cs
	Assets/CharacterStuff/CSCI/CSCI_B_Behavior.cs
	Assets/CharacterStuff/CSCI/CSCI_BackAir.cs
	Assets/CharacterStuff/CSCI/CSCI_C_Behavior.cs
	Assets/CharacterStuff/CSCI/CSCI_ForwardAir.cs
	Assets/CharacterStuff/CSCI/CSCI_Recovery.cs
	Assets/CharacterStuff/CSCI/CurlyBracketHitbox.cs
	Assets/CharacterStuff/GSAS/Boomerang.cs
	Assets/CharacterStuff/GSAS/GSAS_B_Behavior.cs
	Assets/CharacterStuff/GSAS/GSAS_BackAir.cs
	Assets/CharacterStuff/GSAS/GSAS_C_Behavior.cs
	Assets/CharacterStuff/GSAS/GSAS_DownAir.cs
	Assets/CharacterStuff/GSAS/GSAS_ForwardAir.cs
	Assets/CharacterStuff/GSAS/GSAS_Idle_Behavior.cs
	Assets/CharacterStuff/GSAS/GSAS_UpAir.cs
	Assets/Resources/Master.prefab
minor bugfixes
changes for pausing purposes