changed random to only choose stages that exist
redid numbering of characters/stages in menu
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	Assets/Standard Assets/Toon Shading/Toony-BasicOutline.mat
	DuelMajorRepo.userprefs
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
Separated player controls for 2 different people
players spawn at location farthest from the other player
fixed facing
Merge remote-tracking branch 'origin/Chris_Branch'

Conflicts:
	Assets/CameraMovement.cs
	Assets/CameraMovement.cs.meta
	Assets/CharacterStuff/CameraMovement.cs
	Assets/CharacterStuff/CameraMovement.cs.meta
	Assets/Misc/CameraMovement.cs
	Assets/Misc/CameraMovement.cs.meta
	DuelMajorRepo.userprefs
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	DuelMajorRepo.userprefs
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	DuelMajorRepo.userprefs
see spencer change log 4/2  1:00AM
Added SlideMotion and groundDeceleration
no message
Fixed bug in slide movement
loljk
it wouldn't let me pull do now i do this
Merge remote-tracking branch 'origin/master'

Conflicts:
	DuelMajorRepo.userprefs
Implemented full dashing system
Merge remote-tracking branch 'origin/master'