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