andreiChanges
Merge branch 'andreiChanges'

Conflicts:
	client.c
	server