2014-8-29
Merge branch 'master' of https://github.com/zenwalk/zenwalk.github.io

Conflicts:
	archives.html
	author/foobar.html
	authors.html
	categories.html
	category/review.html
	feeds/foobar.atom.xml
	feeds/foobar.rss.xml
	index.html
	my-first-review.html
	tags.html