remove local intellij files, added .gitignore
concluding merge