More NPC updates
conflict
update
damn you git
More fixes
forgot this one
Merge pull request #792 from EPuncker/master

NPC Updates