server make

1. ver. Done
Merge remote-tracking branch 'origin/Server' into Client---Peter