Deleted .orig files left over from a merge.
Deleted .orig files left over from a merge and updated gitignore to ignore *.orig files.