Merge branch 'master' of https://github.com/williamlao/.emacs.d
Merge branch 'master' of https://github.com/williamlao/.emacs.d
update statup course ip
adding ps alias
Merge branch 'master' of https://github.com/williamlao/.emacs.d

Conflicts:
	other/com.googlecode.iterm2.plist