resolved random sync conflicts
Merge branch 'master' of github.com:omardelarosa/dotfiles