Git merge config: diff3
Merge branch 'master' of github.com:martijnvermaat/dotfiles