add popwin.el
Merge branch 'master' of https://github.com/wadap/config

Conflicts:
	.bashrc