Started work on NPC stuff
Merge branch 'master' of github.com:jbolunra/rpg