initial merge commit
updated gitconfig