pull request
Merge branch 'master' of https://github.com/DrunkReaperMatt/PCQ-Conjure-Omega

Conflicts:
	Assets/Script/character/Character.cs