end of day 22 26712 words
mid day 23 28709 words
Merge branch 'master' into gh-pages

Conflicts:
	index.md