Fixed the single-entity-showing bug
Merged the files. I don't even know.
Something might bone up.

Merge branch 'master' of https://github.com/qmpzaltb/cptgame

Conflicts:
	Dung/src/dungContent/ControllerPlayer.java