Added IntelliJ and Eclipse-specific files to the gitignore.
Merge remote-tracking branch 'origin/master'