Merge branch 'develop' into feature/bug-fixes
- updated gitignore file
Merge branch 'feature/bug-fixes' into develop