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

Conflicts:
	Robot/Assets/MayaFiles/textures/bronze_NRM.png.meta
	Robot/Assets/MayaFiles/textures/brow.png.meta
	Robot/Assets/MayaFiles/textures/brow_NRM.png.meta
	Robot/Assets/MayaFiles/textures/crotch.png.meta
	Robot/Assets/MayaFiles/textures/crotch_NRM.png.meta
	Robot/Assets/MayaFiles/textures/eye.png.meta
	Robot/Assets/MayaFiles/textures/fingers.png.meta
	Robot/Assets/MayaFiles/textures/fingers_NRM.png.meta
	Robot/Assets/MayaFiles/textures/gimparm.png.meta
	Robot/Assets/MayaFiles/textures/gimparm_NRM.png.meta
	Robot/Assets/MayaFiles/textures/gold.png.meta
	Robot/Assets/MayaFiles/textures/gold_NRM.png.meta
	Robot/Assets/MayaFiles/textures/orb.png.meta
	Robot/Assets/MayaFiles/textures/shin.png.meta
	Robot/Assets/MayaFiles/textures/skull.png.meta
	Robot/Assets/MayaFiles/textures/skull_NRM.png.meta
	Robot/Assets/MayaFiles/textures/tin.png.meta
	Robot/Assets/MayaFiles/textures/tin_NRM.png.meta
	Robot/Assets/Resources/Slide5.png.meta
	Robot/Assets/Resources/Slide6.png.meta
	Robot/Assets/Standard Assets/Terrain Assets/Terrain Textures/rock.png.meta
	Robot/Assets/Standard Assets/Terrain Assets/Terrain Textures/rock_NRM.png.meta
	Robot/Assets/Standard Assets/Terrain Assets/Terrain Textures/sand.png.meta
	Robot/Assets/Standard Assets/Terrain Assets/Terrain Textures/sand_NRM.png.meta
	Robot/Assets/other models.meta
	Robot/Assets/other models/Materials.meta
	Robot/Assets/other models/Materials/lambert1.mat
	Robot/Assets/other models/Materials/lambert1.mat.meta
	Robot/Assets/other models/Tree1.fbx.meta
	Robot/Assets/other models/campfire.fbx.meta
	Robot/Assets/other models/dock.fbx.meta
	Robot/Assets/other models/spider.fbx.meta
	Robot/Assets/other models/textures.meta
	Robot/Assets/other models/textures/campfiremap.png.meta
	Robot/Assets/other models/textures/campfiremap_NRM.png.meta
	Robot/Assets/other models/textures/deadtreemap.png.meta
	Robot/Assets/other models/textures/deadtreemap_NRM.png.meta
	Robot/Assets/other models/textures/dockmap.png.meta
	Robot/Assets/other models/textures/dockmap_NRM.png.meta
	Robot/Assets/other models/textures/spiderskin.png.meta