NPC basic

Not currently doing anything except mumbling
Merge

Conflicts:
	sourcefiles/GXPEngine/obj/x86/Debug/GXPEngine.pdb