edited gitignore to ignore p4merge files