added line 2 on client
Resolved 1.txt

Conflicts:
	1.txt