Added attributes to player class
Added a NPC class
Merge branch 'master' of https://github.com/AbeDillon/RenAdventure

Conflicts:
	engine.py
These are others changes.  Already in place not sure why I have them to commit