moving platforms of death
Merge branch 'master' of https://github.com/BOLDInnovationGroup/Bold-Innovation-Group-The-Game--Origins

Conflicts:
	BOLD-GAME/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_diffuse.png.meta
	BOLD-GAME/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_normals.png.meta
	BOLD-GAME/Assets/Standard Assets/Character Controllers/Sources/Scripts/CharacterMotor.js
	BOLD-GAME/Assets/Standard Assets/Character Controllers/Sources/Scripts/PlatformInputController.js
	BOLD-GAME/Assets/backupscene1.unity