Boomerang
More boomerang stuff
!! WILL CAUSE CONFLICTS MERGE WITH CARE !!
shielding. also theres terrain now
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/CharacterStuff/GSAS/GSASPrefab.prefab
	DuelMajorRepo.userprefs
Menu looks nice now
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	Assets/CharacterStuff/CharacterProperties.cs
	Assets/CharacterStuff/GSAS/GSAS_B_Behavior.cs
	Assets/CharacterStuff/GSAS/GSAS_B_Behavior.cs.meta
	DuelMajorRepo.userprefs