commented .gitignore
Merge remote-tracking branch 'upstream/master'

updated .gitignore