Added .gitignore file
Merge branch 'develop'