update gitignore
remove node_modules
Merge branch 'master' into gh-pages