Client initial commit
Server initial commit
Shared source initial commit (and added to client)
Merge remote-tracking branch 'origin/master'