Update .gitignore to ignore ide file.
Merge remote-tracking branch 'origin'