added branch1_file2.txt
Merge branch 'test_branch'