configured socket.io origins to work with current heroku app.
resolving merge conflict in server.js