Update to resolve conflict
Merge branch 'master' of https://github.com/tthanhlong/test

Conflicts:
	test.txt