We have updated client and server
Merge branch 'master' of github.com:/hansfilipelo/ChattY

Conflicts:
	server/serverclass/thread.cc