merge cleanup
Added gitignore file.
ignoring .orig files