Merge "Add .rej files to .gitignore"