hostname of the laptop was changed
Merge branch 'master' of https://github.com/hostmaster/emacs.d

Conflicts:
	init.el