Added the main method header in ChatServer.java
Merge branch 'master' of https://github.com/afriedman1/chat-server