Merge branch 'master' of https://github.com/rkty13/BriBorChat

Conflicts:
	bin/Client.class
Merge branch 'master' of https://github.com/rkty13/BriBorChat

Conflicts:
	bin/Client.class