barre de vie
Merge branch 'master' of github.com:NicoSab/Oilin

Conflicts:
	Oilin/Assets/Scripts/PlayerScripts/PlayerHealth.cs
	Oilin/Oilin-csharp.sln
	Oilin/Oilin.sln
	Oilin/Oilin.userprefs
add barrde de vie