Fix bug cham
Merge branch 'master' of ssh://github.com/yuyuvn/CTD-bai1