change
new file
Merge branch 'branch-2' of https://github.com/anhnam1/testMerge into branch-2

Conflicts:
	anhnam1File.txt
	anhnamFile.txt