tweaking textures
hot
Fix stuff
Merge branch 'Levels' of https://github.com/AlexHayton/UnityTestProject2 into Levels

Conflicts:
	Assets/Scenes/Level_LTD001.unity
	Assets/Scenes/Level_LTD001/LightmapFar-0.exr
	Assets/Scenes/Level_LTD001/LightmapFar-1.exr
	Assets/Scenes/Level_LTD001/LightmapFar-2.exr
	Assets/Scenes/Level_LTD001/LightmapFar-2.exr.meta
	Assets/Scenes/Level_LTD001/LightmapNear-0.exr
	Assets/Scenes/Level_LTD001/LightmapNear-1.exr
	Assets/Scenes/Level_LTD001/LightmapNear-2.exr
	Assets/Scenes/Level_LTD001/LightmapNear-2.exr.meta
	Assets/Scenes/Level_LTD001/NavMesh.asset
Merge branch 'refs/heads/Levels' into alex
Add new player model!
Added animations
Fixed the prefab position for new player model
Imported walk and idle animations.
Created an avatar mask.
Created a controller for the player.
Not working still :/
Got a basic idle and walk animation in there.
Put the gun on the guy's head...
Merge branch 'refs/heads/master' into alex
Merging...