Update README file.
Add git ignore.
Merge remote-tracking branch 'upstream/master'