changes to Person and NPC
Merge branch 'master' of https://github.com/tlarmstrong/adventure

Conflicts:
	wonderlandAdventure.cpp
	wonderlandAdventure.h