add line
add line from branch 1
Merge branch 'test' into branch-1

Conflicts:
	test.txt
add line
Merge branch 'branch-1' of https://github.com/imtoantran/test into branch-1

Conflicts:
	test.txt
Merge pull request #1 from imtoantran/branch-1

Branch 1