texture file commit
-bad push (rewrote code)
Merge branch 'master' into Dori

Conflicts:
	Assets/Materials.meta
	Assets/Programmers/Scripts/Victor.meta
	Assets/Programmers/Scripts/mani/Standard Assets/Particles/Sources/Textures.meta
	Assets/Programmers/Textures.meta
	Assets/Textures.meta
	Hypothermia_main_omar/Assets/Art.meta
	Hypothermia_main_omar/Assets/Programmers/Scripts/Daniel.meta
Merge branch 'Dori'