Made changes to BaseNPC (both files), Spawner (both files), and World.cpp.
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4