text added
change text
change text more
conflict fixed
deleted .gitignore
add .zsh.d
amend
Merge branch 'master' of github.com:slont/dotfiles