Basic Server and Client.
Added server and client.
Merge remote-tracking branch 'upstream/master'