sua lan 1
edited lan 2
Merge remote-tracking branch 'origin/t@lu' into t@lu

Conflicts:
	talu/test.txt
Merge remote-tracking branch 'origin/master' into t@lu
add new file
Merge branch 'master' into t@lu