Initial Master commit.
commit to new branch: branch1.
additional master commit.
Additional branch-1 data.
Merge branch 'master' of github.com:MvGulik/tmp_branch_testing into branch1
Merge branch 'master' of github.com:MvGulik/tmp_branch_testing
Merge branch 'branch1'

Conflicts:
	File1.txt