.gitignore changed
Merge branch 'feature/editing-gitignore' into develop