without stupid comments
Merge branch 'master' of https://github.com/ivanchoff/Client_Server