Merge pull request #4 from mentatzoe/master

Added NPC + fixed naming in NPC class