Set timeout for client and server
Merge branch 'master' of https://github.com/cdslug/project2_cs118