abc
Merge branch 'gh-pages' of https://github.com/jinfwhuang/testing_pelican into gh-pages

Conflicts:
	fabfile.pyc
	output/tags.html
	settings.pyc