Merge branch 'master' of https://github.com/Azure/dev-spaces into s-tuli/convertTots

Author: a-tuli

samples/BikeSharingApp/Bikes/server.js

@@ -349,7 +349,7 @@ app.get('/hello', function(req, res) {
 });
 
 // start server ------------------------------------------------------------
-var port = 80;
+var port = process.env.PORT || 3000;
 var server = null;
 
 process.on("SIGINT", () => {
@@ -403,4 +403,4 @@ async.retry({times: 10, interval: 1000}, tryMongoConnect, function(err, result)
     server = app.listen(port, function () {
         console.log('Listening on port ' + port);
     });
-});
+});