squash merge local changes adding reformat and package
merging with origin adding *.orig to .gitignore