Timeline finished
Merge branch 'master' of https://github.com/zym1010/CMU_10-701_Project