all
all
Merge branch 'master' of https://github.com/eiselekd/dotfiles

Conflicts:
	.emacs.d/init.el