edit
Merge branch 'master' of https://github.com/truongan/cham_bai_script
Merge branch 'master' of https://github.com/truongan/cham_bai_script

Conflicts:
	cham_bai.sh