Merge "Update .gitignore file to ignore IntelliJ IDEA files"