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

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