2014-04-28
Merge branch 'master' of github.com:lidashuang/dotfiles

Conflicts:
	zshrc