Merge "adding IntelliJ IDEA project files to .gitignore"