Made Teacher the same as generic npc so that it actually works
Merge branch 'master' of https://github.com/stuycs-apcs-z/classwork