sua lai
Merge branch 'master' of https://github.com/thuydiemdanhthi/diemsinhvienit
sua
Merge branch 'master' of https://github.com/thuydiemdanhthi/diemsinhvienit

Conflicts:
	a.txt