Fixes
Merge branch 'master' of github.com:andreastt/dotfiles

Conflicts:
	i3/config
Resolve conflict