change the config
add the gitignore
Merge remote-tracking branch 'origin/master'