中文Merge branch 'master' of github.com:kexinwb/kexinwb.github.com

Conflicts:
	_includes/themes/black/default.html
Merge branch 'master' of github.com:kexinwb/kexinwb.github.com