ignore intellij idea files
Merge branch 'dev'
updated the version number