Made the river GameObject, textured the rocks, mountains
Added campfire, dock and their colliders

Merge branch 'master' of https://github.com/jbcon/Robot

Conflicts:
	Robot/Assets/Scene1.unity
Merge branch 'master' of https://github.com/jbcon/Robot

Conflicts:
	Robot/Assets/2DAssets/pickup2.png.meta
	Robot/Assets/MayaFiles/Tree2.fbx.meta
	Robot/Assets/MayaFiles/Tree3.fbx.meta
	Robot/Assets/New Terrain 1.asset
	Robot/Assets/Resources/Slide3.png.meta
	Robot/Assets/Resources/pickup2.png.meta
	Robot/Assets/RobotCharacter/robot_Animation_vBakeFinal.mb.meta
	Robot/Assets/RobotCharacter/robot_Animation_vFinal.mb.meta
	Robot/Assets/Scene1.unity
	Robot/Assets/Scripts/FaceCamera.cs
	Robot/Assets/other models/Tree2.fbx.meta
	Robot/Assets/other models/Tree3.fbx.meta
Merge branch 'master' of https://github.com/jbcon/Robot

Conflicts:
	Robot/Assets/Scene1.unity
	Robot/Assets/other models/Materials/lambert4.mat.meta
	Robot/Assets/other models/Materials/lambert5.mat.meta
	Robot/Assets/other models/Materials/lambert6.mat.meta
	Robot/Assets/other models/Materials/lambert7.mat.meta