Merged and updated .gitignore
Merging
Manual merge