removed line
workspace
Merge branch 'master' of https://github.com/CaptFrank/Zigbee_Server

Conflicts:
	XMPP_Client.py