Modify .zshrc
Merge branch 'master' of github.com:jtwp470/dotfiles
Modify alias.zsh
Merge branch 'master' of github.com:jtwp470/dotfiles

Conflicts:
	.zshrc
	zsh.d/alias.zsh