ignore IntelliJ Idea files
Merge branch 'dev'