Add a few changes and pray for a clean merge
Merge branch 'master' of github.com:dugancathal/dotfiles