12122322
1212commit
Merge branch 'master' of github.com:xiazhiyu/xiazhiyu.github.io

Conflicts:
	.DS_Store
	_config.yml
	cn/.DS_Store
	ja/.DS_Store