Merge branch 'master' of https://github.com/nhocconvn/trucbach

Conflicts:
index3.html
Dong bo lai