stuff
Merge branch 'master' of https://github.com/userna/CS425
Merge branch 'master' of https://github.com/userna/CS425
added client restart functionality