emacs
Merge branch 'master' of github.com:rdamen/dotfiles

* 'master' of github.com:rdamen/dotfiles:
  emacs

Conflicts:
	emacs/.emacs.d/init.el
emacs