modified .gitignore
Merge branch 'develop': modified .gitignore