Revert branch to KhanhLinh
Duy hieu
See merge request !76 (merged)
(cherry picked from commit 51060628)
aa271dd4 chinh lai UI 8ab2574f more UI change a609cc2d push lai 604efc3f push 32d5fb32 push
Co-authored-by: Tran Khanh Linh (K18 HL) linhtkhe180134@fpt.edu.vn