big ass new assets set update wohoo
assets update no2
Merge branch 'viktor' of https://github.com/Gogoud/welcome_back into viktor

Conflicts:
	Assets/Graphics/3D/Props/Materials/polySurface48Mat.mat
	Assets/Graphics/3D/Props/Materials/polySurface48Mat.mat.meta
	Assets/Graphics/3D/Props/Prop_Freezer_model.fbx.meta
	Assets/Graphics/3D/Props/Prop_Gascan_model.fbx
	Assets/Graphics/3D/Props/Prop_LightswitchOn&Off_model.fbx.meta
	Assets/Graphics/3D/Props/prop_car_model.obj.meta
	Assets/Graphics/3D/textures/DiffuseMaps/Prop_SecurityCam_dirty_diff (1).png.meta
	Assets/Graphics/3D/textures/DiffuseMaps/doll_diffuse_purple.png.meta
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/23/23c56c45c3b9b354aaffe6537e21f6b0
	Library/metadata/25/252d895022ea3a54bb2b575c4e2239ba
	Library/metadata/46/46f38406c17f9a24e889fc4bbc9eb4cb
	Library/metadata/4c/4c9fead9d13ad61489332e9a2cf716a0