Merge pull request #1 from leoherbie/master

adding intellij files to gitignore