Changes to ground movement motors
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/CharacterStuff/AllBehaviors/MovementBehavior.cs
preliminary hitbox, also charprop stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	DuelMajorRepo.userprefs