Modified configuration file
Merge branch 'master' of github.com:ZhaoXigua/xigua.github.com

Conflicts:
	_config.yml