updated server.js
new merge
Merge branch 'master' of github.com:tawfiqmp/API-Project