Update documentation
Update documentation
Merge branch 'gh-pages'

Conflicts:
	author/jacob-shotwell.html
	category/misc.html
	feeds/all-en.atom.xml
	feeds/all.atom.xml
	feeds/misc.atom.xml
	hello-world.html
	index.html