Test 1
Merge branch 'master' of https://github.com/tinnguyentrong/remote

Conflicts:
	test1.txt