Initial commit
Fixed merge gitconfig