no i3-dmenu-desktop in debian just yet
Merge branch 'master' of github.com:geier/dotfiles

Conflicts:
	.i3/config