Tune i3;
Merge branch 'master' of github.com:naspeh/dotfiles
Merge branch 'master' of github.com:naspeh/dotfiles

Conflicts:
	i3/config