Add node_modules to gitignore
merge master
package.json