windows line ending?
Merge branch 'master' of github.com:louisroy/dotfiles