fix conflict
Merge branch 'master' of https://github.com/nhuhai/cs157A_team_random