adding some NPC-related stuff
Merge branch 'master' of https://github.com/hankland/cs169