added 2nd line to branch1.txt
added 3rd line mac.txt
Merge branch 'test_branch'
add raz.txt fr raz branch
add master_file2
Merge remote-tracking branch 'origin/master' into test_branch