new git config
regis with accent
Merge branch 'master' of github.com:regb/dotfiles

Conflicts:
	gitconfig