Added .orig files to gitignore
They are backups from merges