xconfig for tyr
Merge branch 'master' of github.com:Klowner/dotfiles

Conflicts:
	i3/config.all