Adding idea files to ignore list
Changing gitignore
Merge remote-tracking branch 'github/master'