Modifying test.md
Commit till branch 2
Adding file to branch 2
Merge branch 'test_branch_1' into test_branch_2

Conflicts:
	test.md