Develop

Merging .gitignore changes.