add npm-debug.log to .gitignore
Merge branch 'master' into webhooks_2