test branch commit for 4
add testfile_2.txt for test_branch for 1
Merge branch 'test_branch' of https://github.com/JimTse2014/testproject

* 'test_branch' of https://github.com/JimTse2014/testproject:
  add testfile_2.txt for test_branch for 1
  test branch commit for 4

Conflicts:
	test_file.txt