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

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