finish Ran's part
Merge branch 'master' of https://github.com/chenran818/CMU10601-Project