meta
Merge branch 'master' of github.com:NicoSab/Oilin

Conflicts:
	Oilin/Assets/PauseScript.cs.meta
	Oilin/Assets/Textures/barredeVie.png.meta
	Oilin/Assets/Textures/pause.png.meta
base level (models and prefabs done)
base level (models and prefabs done)