Good commmit

Conflicts:
	file_client_1.txt
Merge remote-tracking branch 'origin/master'