Add Magit.
Merge branch 'master' of github.com:eigenhombre/emacs-config

Conflicts:
	org/init.org