Added browserify and lodash to package.json and gulpfile.js along with new routes in server.js
Fixed merge conflict in package.json. Merged changes from master branch.