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