Updating everything but server.js onto the master