Fine tuning needed

Conflicts:
	client-server/client
	client-server/client.c
	client-server/server
	client-server/server.c

	modified:   client-server/client.c
	modified:   client-server/server.c