added intellij setting
Merge branch 'master' of https://github.com/jenix21/config