Add Standalone server/client
Merge branch 'master' of https://github.com/Shajan/CS