gitconfig added
gitconfig merged from master