removed yelp info from server.js
merged server.js by hand