(#181) Updating .gitignore file

- Added additional check to prevent *.orig files, which are generated by kdiff when doing a merge, being checked into source control
Merge pull request #182 from gep13/feature/Issue-181

Updating .gitignore file