6407 words, day 7
Merge branch 'master' into gh-pages