fixed merge
Merge branch 'master' of github.com:mrtnbroder/dotfiles_v2