added screenlock script (save it in /bin/screenlock)
Merge branch 'master' of https://github.com/kpadma/i3

fast-forward errors