delete
add trailing line
add alias
Merge branch 'master' of github.com:progd/dotfiles

 merge is necessary,