updated .gitignore
Merge branch 'hotfix'