did changes on the Character Stat machine
no message
Merge branch 'master' of https://github.com/DrunkReaperMatt/PCQ-Conjure-Omega

Conflicts:
	Assets/Script.meta
	Assets/Script/character/PlayerControl.cs.meta