gitignore
init
not needed
Merge branch 'dev'