Corrected client_server (small changes)
Merge branch 'report' of https://github.com/Ezphares/sw705e13 into report