work on dirchat
work on dirchat
Merge branch 'master' of https://github.com/brotoes/dirchat

Conflicts:
	dirchat.c