added the coeficients for the obj function
merge fixed and modified gitignore for .orig files