remove dependencies and add node_modules to gitignore
fix conflict in app.js