changes to .gitignore file to defeault
Merge remote-tracking branch 'origin/master'