server and client are now classes
Merge remote-tracking branch 'origin/master'