Meuk van Rahul
Merge branch 'master' of https://github.com/M0rph3v5/LD27-10-Seconds

Conflicts:
	Assets/HOTween.meta
	Assets/HOTween/Plugins.meta
	Assets/HOTween/Plugins/Editor.meta
	Assets/HOTween/Plugins/Editor/HOTweenV1_Editor.dll.mdb.meta
	Assets/HOTween/Plugins/Editor/HOTweenV1_Editor.dll.meta
	Assets/HOTween/Plugins/HOTween.XML.meta
	Assets/HOTween/Plugins/HOTween.dll.mdb.meta
	Assets/HOTween/Plugins/HOTween.dll.meta
	Assets/HOTween/_Demo.meta
	Assets/HOTween/_Demo/CubeMat.mat.meta
	Assets/HOTween/_Demo/HOTweenDemoBrain.cs.meta
	Assets/HOTween/_Demo/_DemoScene.unity.meta
	Assets/HOTween/readme.txt.meta
	Assets/Materials.meta
	Assets/Materials/SkyboxMaterial.mat
	Assets/Materials/SkyboxMaterial.mat.meta
	Assets/Materials/TestTexture.mat.meta
	Assets/Materials/skybox.png.meta
	Assets/RewindManager.meta
	Assets/Scenes.meta
	Assets/Scenes/Benjamin.unity.meta
	Assets/Scenes/MainScene.unity.meta
	Assets/Scenes/Rahul.unity.meta
	Assets/Scripts.meta
	Assets/Scripts/GunControlScript.cs.meta
	Assets/Scripts/RewindableScript.cs.meta
	Assets/Scripts/RotateScript.cs.meta
	Assets/Standard Assets.meta
	Assets/Standard Assets/Character Controllers.meta
	Assets/Standard Assets/Character Controllers/3rd Person Controller.prefab.meta
	Assets/Standard Assets/Character Controllers/First Person Controller.prefab
	Assets/Standard Assets/Character Controllers/First Person Controller.prefab.meta
	Assets/Standard Assets/Character Controllers/Sources.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Constructor.FBX.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Materials.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Materials/constructor_done.mat.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_diffuse.png.meta
	Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_normals.png.meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts.meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts/CharacterMotor.js.meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts/FPSInputController.js.meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts/MouseLook.cs.meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts/PlatformInputController.js.meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts/ThirdPersonCamera.js.meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts/ThirdPersonController.js.meta
Meer Rahul meuk