updated TODO
Merge branch 'master' of https://github.com/haocow/cs118-project2
Merge branch 'master' of https://github.com/haocow/cs118-project2
Merge branch 'master' of https://github.com/haocow/cs118-project2