Update TODO after 12/16
Merge branch 'master' of github.com:cpitclaudel/6.830