hotfix for gitignore
Merge branch 'hotfix-gitignore'