Working on NPC battle logic
Merge branch 'master' of https://github.com/maxbrister/nmt-jam0