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

Conflicts:
	bin/.gitignore