Git ignoring .idea directory
Git ignoring some intellij idea generated stuff
Merge branch 'master' into camel