commiting the gitignore file
Merge branch 'dev'