test
Merge branch 'master' of https://github.com/taniyu/emacs

Conflicts:
	.emacs.d/inits/30-yasnippet.el