Changes to .gitignore
Fixed merge