Ignoring idea project files
Merge remote-tracking branches 'upstream/master' and 'origin/master'