w?
Merge branch 'master' of https://github.com/ydm/dotFiles
emacs: resolve conflicts with i3
Launch i3 instead of Awesome