merge
Merge branch 'master' of github.com:lucasp0927/Emacs-setting

Conflicts:
	.emacs.d/custom/emacs_org.elc