added c.txt, edited b.txt
Merge branch 'test_branch'