add git alias
Modify macbook pro
iMac
Merge branch 'pro'

Conflicts:
	.tmux.conf
	.vimrc.basic
	.zshrc