first modification to test two connections!
Merge branch 'master' of https://github.com/cs6490groupJMR/ProtoSecureChat

Conflicts:
	xmpp_client.py
changes to protocol to make it easier to communicate