java server with s protocal
fixing merge conflict

Merge branch 'python_socket' of https://github.com/too87/CS594_gameprogramming into python_socket