test conflict
Merge branch 'master' of https://github.com/akabachkov/hello-world

* 'master' of https://github.com/akabachkov/hello-world:
  test

Conflicts:
	file1.txt