Merge pull request #4 from tanz-sullamora/master

Merge
npc move+talk
Merge pull request #9 from QuotedGames/master

NPC move & talk