added intelij files to .gitignore
updated .gitignore
Merge branch 'master' of github.com:danielpetroianu/COSP_Scala

* 'master' of github.com:danielpetroianu/COSP_Scala:
  Update README.md
  Update README.md