Merge branch 'master' of https://github.com/agoettler/Chat-App

Conflicts:
ChatClient.py
How do I keep Nick's changes?!