Adjusted gun to be 360 aiming
Adjusted sword to be a charge up attack
Merge branch 'master' into Experimental

Conflicts:
	Assets/_Assets/_Player/Player.prefab
	Assets/_Scripts/_Objects/_Player/InputController.cs
	ProjectSettings/InputManager.asset