update to git config
Merge remote-tracking branch 'remotes/origin/master'
fixed .gitignore
final fix to .gitignore