added gitconfig
Merge branch 'nou'