test d
rename
Merge branch 'tran.anh.duy'

Conflicts:
	src/5.txt
	src/6.txt
	src/d5.txt
	src/d6.txt
	src/master5.txt
	src/master6.txt