upper case NPCs
Merge branch 'report' of github.com:macabot/CMG into report