Ajout de la bar de vie
no message
Merge branch 'master' of https://github.com/DrunkReaperMatt/PCQ-Conjure-Omega

Conflicts:
	Assets/Prefabs.meta
	Assets/Script/AI.meta
	Assets/Script/character/Character.cs