Merged two .gitignore files