big update
Merge branch 'master' of https://github.com/duonghm56/Project-sem-2