Changed class name

Npc class name changed
Added a new boolean for of the player is in the position
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/northwind/entity/Player.java
Changed name of npc

df