6 коммит
Merge remote-tracking branch 'remotes/origin/sub_branch2'

Conflicts:
	file2.html