blog update
Merge branch 'master' of github.com:carpedm20/blog

Conflicts:
	cache/ArticlesGenerator-Readers
	cache/PagesGenerator-Readers
	content/pages/about.rst
	output/about/index.html
blog update