popwin.el conf
Merge branch 'master' of https://github.com/usobuku/dotfiles

Conflicts:
	.emacs.d/conf/10_elisp.el