Basket
Merge branch 'master' of https://github.com/Nizar89/MycoseBucale

Conflicts:
	ProjectAsylum/Assets/Abajour.FBX.meta
	ProjectAsylum/Assets/Caisse.FBX.meta
	ProjectAsylum/Assets/Chaise.FBX.meta
	ProjectAsylum/Assets/LampeMurale.FBX.meta
	ProjectAsylum/Assets/Lit.FBX.meta
	ProjectAsylum/Assets/Materials/Desktop.mat
	ProjectAsylum/Assets/Materials/Desktop.mat.meta
	ProjectAsylum/Assets/Materials/texture_bras_finito.mat
	ProjectAsylum/Assets/Materials/texture_bras_finito.mat.meta
	ProjectAsylum/Assets/Plafonnier.FBX.meta
	ProjectAsylum/Assets/Scene/TestScene.unity
	ProjectAsylum/Assets/armoire.FBX.meta
	ProjectAsylum/Assets/armoire_02.FBX.meta
	ProjectAsylum/Assets/bras.FBX.meta
	ProjectAsylum/Assets/etagere_01.FBX.meta
	ProjectAsylum/Assets/etagere_02.FBX.meta
	ProjectAsylum/Assets/material/sol.mat
	ProjectAsylum/Assets/table.FBX.meta
	ProjectAsylum/Assets/test.unity
	ProjectAsylum/Assets/textures/Abatjour.png.meta
	ProjectAsylum/Assets/textures/Abatjour_ilum.png.meta
	ProjectAsylum/Assets/textures/Assets.png.meta
	ProjectAsylum/Assets/textures/Assets_normal.png.meta
	ProjectAsylum/Assets/textures/Caisse.png.meta
	ProjectAsylum/Assets/textures/Caisse_normal.png.meta
	ProjectAsylum/Assets/textures/LampeMurale.png.meta
	ProjectAsylum/Assets/textures/LampeMurale_ilum.png.meta
	ProjectAsylum/Assets/textures/Lit.png.meta
	ProjectAsylum/Assets/textures/Lit_normal.png.meta
	ProjectAsylum/Assets/textures/Plafonnier.png.meta
	ProjectAsylum/Assets/textures/Plafonnier_ilum.png.meta
	ProjectAsylum/Assets/textures/Table.png.meta
	ProjectAsylum/Assets/textures/bras.png.meta
	ProjectAsylum/Assets/textures/chaise.png.meta
	ProjectAsylum/Assets/textures/pnj_cadavre.png.meta
	ProjectAsylum/Assets/textures/pnj_cadavre_normal.png.meta
	ProjectAsylum/Assets/tuyau_01.FBX.meta
	ProjectAsylum/Assets/tuyau_02.FBX.meta