virtually no change
Merge branch 'master' of https://github.com/tylerbtz/QuickTalk

Conflicts:
	QuickTalk/bin/networking/Network_Client.class
	QuickTalk/bin/networking/Network_Server.class