commit
Merge branch 'master' of https://github.com/ivan-hidzhov/worktest

Conflicts:
	test.txt
edit