lightmap level 2
Merge branch 'master' of https://github.com/LeTaulier616/crazy_magnets

Conflicts:
	Assets/Scenes/FINAL/CM_Level_2_FINAL.unity
	Assets/Scenes/FINAL/CM_Level_3_FINAL.unity
lightmap level 2 modif
Merge branch 'master' of https://github.com/LeTaulier616/crazy_magnets
level 3 light
graph level 3
Merge branch 'master' of https://github.com/LeTaulier616/crazy_magnets

Conflicts:
	Assets/Scenes/FINAL/CM_Level_2_FINAL.unity
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-0.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-1.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-10.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-11.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-12.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-12.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-13.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-13.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-14.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-14.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-15.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-15.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-16.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-16.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-17.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-17.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-18.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-18.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-19.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-19.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-2.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-2.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-20.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-20.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-21.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-21.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-22.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-22.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-23.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-23.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-24.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-24.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-25.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-25.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-26.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-26.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-27.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-27.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-28.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-28.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-29.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-29.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-3.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-3.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-30.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-30.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-31.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-31.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-4.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-4.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-5.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-5.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-6.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-6.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-7.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-7.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-8.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-8.exr.meta
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-9.exr
	Assets/Scenes/FINAL/CM_Level_2_FINAL/LightmapFar-9.exr.meta
	Assets/Textures/Decor/brume2.tga
	Assets/Textures/brume2.tga
	Assets/Textures/brume2.tga.meta
	Assets/brume2.tga
Merge branch 'master' of https://github.com/LeTaulier616/crazy_magnets