change to test merge tool
Merge branch 'master' of https://github.com/haihuocnhi123/test

Conflicts:
	dinh funny.txt