Additional Intellij files
Additional Intellij files. Removed from gitignore
Merge remote-tracking branch 'origin/master'