Merge
Merge branch 'master' of github.com:senft/dotfiles
Merge branch 'master' of github.com:senft/dotfiles

Conflicts:
	.config/bspwm/panel