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

Conflicts:
	client/NetClient.cc
	server/log.txt