added sendHistory in user.cc
Merge branch 'master' of github.com:/hansfilipelo/ChattY

Conflicts:
	server/user/User.cc