emacs
Merge branch 'master' of github.com:locojay/dotfiles

Conflicts:
	aliases.zsh