merge from work branch
git lol
Merge branch 'master' of github.com:bukzor/dotfiles