Conflict fix

Updated NPC spawning

Gave NPCs a short description.
Gave NPCs multiple
names.
Modified all other functions to match these changes.
Merge branch 'master' of https://github.com/Cireminer/Text-Adventure-Framework