init
Merge branch 'master' of github.com:james0zan/james0zan.github.io

Conflicts:
	archives.html
	author/mingxing-zhang.html
	category/pages.html
	feeds/all-en.atom.xml
	feeds/all.atom.xml
	feeds/atom.xml
	feeds/pages.atom.xml
	index.html