ignore .idea folder
Merge branch 'master' into def