cleaned up client code
Merge branch 'master' of https://github.com/tastyporkchop/simplemessenger