I did commit
test
Merge branch 'master' of https://github.com/DrunkReaperMatt/PCQ-Conjure-Omega

Conflicts:
	Assets/Packages/NGUI Next-Gen UI.unitypackage.meta
	Assets/Script/character/Character.cs