update
added .gitignore
Merge branch 'dev'