server and client have been modified
erge branch 'master' of https://github.com/mjavaid/fyp-uottawa