Merge error fixed.

Dat Git merge.
Fixed merge error. Why do I keep getting these?

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

Conflicts:
	Dung/src/dungContent/ControllerPlayer.java