atom
Merge branch 'master' of github.com:stuki/dotfiles