update todo
Merge branch 'master' of github.com:tanchao/tanchao.github.com