zx
Merge branch 'master' of github.com:bumaociyuan/bumaociyuan.github.io
	modified:   _posts/terminal/2014-09-04-shell-note.md