Add todo text, because of accidental publish of unfinished chapter
Merge branch 'master' into gh-pages