WOrking on slick bit depth issue.
Got Server and Client passing map back and forth
Merge branch 'Develop' of
ssh://git@github.com/D3LTR0N-Z3R0/GameProject.git into Develop

Conflicts:
	src/rogueproject/Actor.java
	src/rogueproject/Player.java
	src/rogueproject/PlayingState.java
Manual Merge
Still fixing git.
finished manual merge