Test
Merge branch 'master' of github.com:luong-phuc-mulodo/testconflit

Conflicts:
	test2.txt