renamed web.js
fix merge Merge branch 'master' of github.com:jmluc123/CSI120ClassNodeDemo

Conflicts: