fixed history
Merge branch 'master' of github.com:/hansfilipelo/ChattY

Conflicts:
	server/room/room.cc
	server/serverclass/thread.cc
	server/user/User.cc