end of day 21, 26k words
Merge branch 'master' into gh-pages