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

Conflicts:
	Assets/NGUI/Examples/Animations/Button.anim
	Assets/NGUI/Examples/Animations/Checkmark.anim
	Assets/NGUI/Examples/Animations/Logo.anim
	Assets/NGUI/Examples/Animations/Window - Back.anim
	Assets/NGUI/Examples/Animations/Window - Forward.anim
	Assets/NGUI/Examples/Atlases/Fantasy/Fantasy Atlas.mat
	Assets/NGUI/Examples/Atlases/Fantasy/Fantasy Atlas.prefab
	Assets/NGUI/Examples/Atlases/Fantasy/Fantasy Font - Normal.prefab
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Atlas.mat
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Atlas.prefab
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Font - Header.prefab
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Font - Normal.prefab
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Atlas.mat
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Atlas.prefab
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Font - Header.prefab
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Font - Normal.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Arimo14.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Arimo18.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Arimo20.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Wooden Atlas.mat
	Assets/NGUI/Examples/Atlases/Wooden/Wooden Atlas.prefab
	Assets/NGUI/Examples/Materials/Backdrop.mat
	Assets/NGUI/Examples/Materials/brick.mat
	Assets/NGUI/Examples/Materials/burlap.mat
	Assets/NGUI/Examples/Materials/sand.mat
	Assets/NGUI/Examples/Models/Orc Armor/Orc Armor.mat
	Assets/NGUI/Examples/Models/Orc Armor/Orc Bracers.prefab
	Assets/NGUI/Examples/Models/Orc Armor/Orc Shoulders.prefab
	Assets/NGUI/Examples/Models/Orc/Orc Skin.mat
	Assets/NGUI/Examples/Models/Orc/Orc.prefab
	Assets/NGUI/Examples/Other/Localization.prefab
	Assets/NGUI/Examples/Other/Storage Icon Template.prefab
	Assets/NGUI/Examples/Scenes/Example 1 - UIAnchor.unity
	Assets/NGUI/Examples/Scenes/Example 10 - Localization.unity
	Assets/NGUI/Examples/Scenes/Example 11 - Drag & Drop.unity
	Assets/NGUI/Examples/Scenes/Example 12 - Chat Window.unity
	Assets/NGUI/Examples/Scenes/Example 13 - Tabs.unity
	Assets/NGUI/Examples/Scenes/Example 2 - Interaction.unity
	Assets/NGUI/Examples/Scenes/Example 3 - Menu.unity
	Assets/NGUI/Examples/Scenes/Example 4 - Controller Input.unity
	Assets/NGUI/Examples/Scenes/Example 5 - Lights and Refraction.unity
	Assets/NGUI/Examples/Scenes/Example 6 - Draggable Window.unity
	Assets/NGUI/Examples/Scenes/Example 7 - Scroll View (Panel).unity
	Assets/NGUI/Examples/Scenes/Example 8 - Scroll View (Camera).unity
	Assets/NGUI/Examples/Scenes/Example 9 - Quest Log.unity
	Assets/NGUI/Examples/Scenes/Example X - Character.unity
	Assets/NGUI/Examples/Scenes/Tutorial 1 - Scene.unity
	Assets/NGUI/Examples/Scenes/Tutorial 10 - 3D.unity
	Assets/NGUI/Examples/Scenes/Tutorial 11 - Popup List.unity
	Assets/NGUI/Examples/Scenes/Tutorial 2 - Sprite.unity
	Assets/NGUI/Examples/Scenes/Tutorial 3 - Sliced Sprite.unity
	Assets/NGUI/Examples/Scenes/Tutorial 4 - Tiled Sprite.unity
	Assets/NGUI/Examples/Scenes/Tutorial 5 - Label.unity
	Assets/NGUI/Examples/Scenes/Tutorial 6 - Button.unity
	Assets/NGUI/Examples/Scenes/Tutorial 7 - Slider.unity
	Assets/NGUI/Examples/Scenes/Tutorial 8 - Toggle.unity
	Assets/NGUI/Examples/Scenes/Tutorial 9 - Input.unity
	Assets/NGUI/Examples/Scenes/Tutorial X - Video.unity
	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.meta
	Assets/Script/character/PlayerControl.cs.meta
	ProjectSettings/TagManager.asset