[git] configure difftool
[git] ignore node_modules
Merge remote-tracking branch 'origin/master'