Modified sample file 4 on new branch 1
Modified sample file 4 on new branch 2
Merge branch 'newbranch1' into newbranch2

Conflicts:
	sample_file4.txt