filefolder pelican/output
pelican output
Merge branch 'master' of https://github.com/jincheng/jincheng.github.io

Conflicts:
	archives.html
	authors.html
	categories.html
	index.html
	tags.html