aaa
Merge branch 'master' of github.com:ninehills/dotfiles

* 'master' of github.com:ninehills/dotfiles:
  update .zshrc
  Baidu 服务器特殊配置

Conflicts:
	.zshrc