La till namn i client.cc
Merge branch 'master' of github.com:/hansfilipelo/ChattY

Conflicts:
	client/makefile