New .gitignore
Modified .gitignore
Merge remote-tracking branch 'origin/master'