Camera Following

Made camera follow the player.
Merge branch 'master' of https://github.com/ndclark/FOREST-GAME

Conflicts:
	UnityFolder/Assembly-UnityScript-vs.unityproj
	UnityFolder/Assembly-UnityScript.unityproj
	UnityFolder/Assets/Scripts.meta
	UnityFolder/Assets/Scripts/CharMove.cs
	UnityFolder/Assets/Scripts/HudScript.cs
	UnityFolder/Assets/Scripts/HudScript.cs.meta
	UnityFolder/Assets/Scripts/marioControllerScript.cs
	UnityFolder/Assets/Scripts/marioControllerScript.cs.meta
	UnityFolder/Assets/Sprite Sheet.meta
	UnityFolder/Assets/Sprite Sheet/Face Back.anim
	UnityFolder/Assets/Sprite Sheet/Face Back.anim.meta
	UnityFolder/Assets/Sprite Sheet/Health Bar (Red).png
	UnityFolder/Assets/Sprite Sheet/Health Bar (Red).png.meta
	UnityFolder/Assets/Sprite Sheet/Health Bar.jpg
	UnityFolder/Assets/Sprite Sheet/Health Bar.jpg.meta
	UnityFolder/Assets/Sprite Sheet/Main Character.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Face Left.anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Face Left.anim.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Face Right.anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Face Right.anim.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_1&5_CharacterSideStill_Left 1.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_1&5_CharacterSideStill_Left.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_2_CharacterWalkSide_Left_Trans_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_3_CharacterWalkSide_Left_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_4_CharacterWalkSide_Left_Trans2_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_6_CharacterWalkSide_Left_Trans_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_7_CharacterWalkSide_Left_R.controller
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_7_CharacterWalkSide_Left_R.controller.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_7_CharacterWalkSide_Left_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_8_CharacterWalkSide_Left_Trans2_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_B1&3_CharacterStillBack_Object_1.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_B1&3_CharacterStillBack_Object_2.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterSideStill_Right_1.controller
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterSideStill_Right_1.controller.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterSideStill_Right_1.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterSideStill_Right_2.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterStillBack_1.controller
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterStillBack_1.controller.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterStillBack_1.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterStillBack_2.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterStill_1.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterStill_2.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalkSide_Right_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalkSide_Right_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalkSide_Right_Trans2_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalkSide_Right_Trans2_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalkSide_Right_Trans_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalkSide_Right_Trans_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalk_L.controller
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalk_L.controller.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_CharacterWalk_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_F1&3_CharacterStill_Object_1.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_F1&3_CharacterStill_Object_2.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/GJ1_F4CharacterWalk_Object_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_B2_CharacterWalkBack_Object_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_B4_CharacterWalkBack_Object_L.controller
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_B4_CharacterWalkBack_Object_L.controller.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_B4_CharacterWalkBack_Object_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_CharacterWalkBack_L.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_CharacterWalkBack_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_CharacterWalk_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_F2_CharacterWalk_Object_R.controller
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_F2_CharacterWalk_Object_R.controller.meta
	UnityFolder/Assets/Sprite Sheet/Main
Character/Gj1_F2_CharacterWalk_Object_R.png.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/New Animator
Controller.controller
	UnityFolder/Assets/Sprite Sheet/Main Character/New Animator
Controller.controller.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Backwards
(Holding Object).anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Backwards
(Holding Object).anim.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Backwards.anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking
Backwards.anim.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Forward
(Holding Object).anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Forward
(Holding Object).anim.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Forward.anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking
Forward.anim.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Left.anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Left.anim.meta
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Right.anim
	UnityFolder/Assets/Sprite Sheet/Main Character/Walking Right.anim.meta
	UnityFolder/Assets/Sprite Sheet/Water Bar.png
	UnityFolder/Assets/Sprite Sheet/Water Bar.png.meta
	UnityFolder/Assets/scene1.unity
	UnityFolder/UnityFolder.userprefs