.gitignore is now working
Merge branch 'develop'