Added .gitignore file
Merge branch 'dev'