add .gitignore
Merge branch 'develop' into feature/gow