Merge my .gitignore with Diego’s