working on pathfinding
Merge branch 'Enemy' into Develop
fixed merging

Conflicts:
	src/rogueproject/Player.java
	src/rogueproject/PlayingState.java

	added files
	
	working on pathfinding
added pathfinding file
	still working on