Made updatePosition() better
Fixed some things that were bad before
Merge branch 'NPC' of https://github.com/hexointed/Thuquhux into NPC

Conflicts:
	NPC/NPC.cpp