readme
Merge branch 'master' of https://github.com/softrock/test-task

Conflicts:
	README.md