gitconfig changes + simple installer added
conflicts resolved