c
Merge branch 'master' of github.com:JamesYuan/emacs.d

Conflicts:
	lisp/init-lisp.el
Merge branch 'master' of https://github.com/purcell/emacs.d
Merge branch 'master' of github.com:JamesYuan/emacs.d
Merge branch 'master' of https://github.com/purcell/emacs.d
c