Update
Merge branch 'master' of github.com:ychubachi/.emacs.d

Conflicts:
	org/setup.org