alt-tab
Merge branch 'master' of github.com:flammie/dotfiles

Conflicts:
	i3/config
Use new script for autolck