Added Atom into Brewfile
Merge branch 'master' of github.com:Mrk1869/dotfiles
Settings for zsh
Removed a conflict
Added scroll-reverser into Brewfile