git alias
Merge branch 'master' of github.com:lbolla/dotfiles

Conflicts:
	.mutt/aliases.rot13
alias