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

Conflicts:
	elpa/archives/marmalade/.~/archive-contents~
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/.~/archive-contents~
	elpa/archives/melpa/archive-contents