...
...
...
Merge branch 'master' of github.com:christofferchen/my-emacs-config

Conflicts:
	.emacs
	.emacs.d/ac-comphist.dat
	.emacs.d/my-lisp/paths-config.el

...