added client timeout handler
Merge branch 'master' of https://github.com/aroskuski/CS3516-prog3