Merge branch 'main' of https://github.com/hdthinh1012/fcj-workshop-0-…

Merge branch 'main' of https://github.com/hdthinh1012/fcj-workshop-0-… #2