Merge??
Merge branch 'master' of https://github.com/pedropenna/.emacs.d

Conflicts:
	ac-comphist.dat