Update .gitignore and README.
Merge remote-tracking branch 'origin/master'