elpa
Merge branch 'master' of github.com:muldvang/dotfiles

Conflicts:
	.emacs.d/elpa/archives/melpa/archive-contents