Competition + fix DAO
Merge remote-tracking branch 'origin/PhongPH'