added the git configs to the file
modified gitconfig
Merge branch 'master' into linux