Update documentation
Merge branch 'gh-pages'

Conflicts:
	blogging-stack.html
Merge branch 'master' into gh-pages