modification
resolve a conflict
modification
Merge branch 'emacs-live' of https://github.com/shadowlaw/emacs into emacs-live

Conflicts:
	live-packs/aymen-pack/config/global-config.el
	live-packs/aymen-pack/config/package-install-config.el
added elpa directroy to the list of ignored ones