added intellij files to gitignore
merge
merge