Getting ready to pull merge conflict fixes
Merge branch 'master' of https://github.com/BOLDInnovationGroup/Bold-Innovation-Group-The-Game--Origins

Conflicts:
	BOLD-GAME/Assets/Standard Assets/Character Controllers/Sources/Scripts/CharacterMotor.js