Updated .gitignore.
Merge remote-tracking branch 'tharpa/master'