added gitignore file
Merge branch 'hotfix'