client
Merge branch 'master' of https://github.com/pulse-than/test

Conflicts:
	test2.txt