aliasの追加
Merge branch 'master' of github.com:kuwata0037/dotfiles

Conflicts:
	.zshrc emaの方を"/Applications/Emacs.app/Contents/MacOS/Emacs &"に割り当て