Add npc class and updated enemy class
Merge remote-tracking branch 'origin/master'