Added server & client classes
Merge remote-tracking branch 'origin/master'
Added server & client classes