asdfasdf
Merge branch 'master' of https://github.com/martinkalugin/test1

Conflicts:
	file3.txt