Simplified some code
Merge branch 'master' of github.com:myran2/Adventure

Conflicts:
	NPC.java