Adding gitignore.
Merge remote-tracking branch 'upstream/master'
modifying gitignore.