Fixed .gitignores
Merge