.gitignore file added
Merge branch 'develop'