added conflict.txt file
Merge branch 'master' of github.com:RomanPeshkov/git_test

Conflicts:
	conflict.txt