Adding .idea files to the repository, except workspace.xml and tasks.xml, which are personal files.
Merge remote-tracking branch 'origin/master'