xu ly loc, test thu di
Merge branch 'master' of https://github.com/quan32/ITJ