Added ignore rule for .idea folders, so the IDE configurations won't sync...
Merge remote-tracking branch 'origin/master'