new file:   .emacs.d/helm-ls-git/helm-ls-git.elc
Merge branch 'master' of https://github.com/abelardojarab/emacsfull

Conflicts:
	.emacs