Procfile for heroku. Fixed server.js merging error