edit file in b1
Merge branches 'b1' and 'master' of https://github.com/manhnv118/test

Conflicts:
	file.txt