screen
Merge branch 'master' of github.com:mjirik/i3setup
fix merge screen