merged some of the new CaveServer.java to my CaveServer.java.
Merge branch 'master' of https://github.com/busdiekc/htw