Added gitignore file
Merge branch 'updates'