Merge pull request #7 from NN1/MyBranch1

NPCs, etc.