adding new method for testing
cleaning up server code a little
Merge branch 'master' of https://github.com/nikeah/ChatProgramP2P