magit
Merge branch 'master' of github.com:zakandrewking/emacs-d

Conflicts:
	init.el