Add gitignore to project
Merge branch 'develop'