ignoring IntelliJ IDEA files
Merge branch 'master' into node