Update client.py
Update server.py
Merge pull request #2 from Fedjmike/master

Thread joins