Updating
Uppdating
Fixing merge
Fixing merge
Merge branch 'master' of github.com:johnbeynon/dotfiles