Updated web.js
Merge remote-tracking branch 'origin/master'
checking that github/nitrous/heroku are working ok