Adding Idea project files to gitignore
Merge branch 'master' into testbranch