Updated web.js
Updated web.js
Added index.html
web.js now serves index.html
fixed merge problem in web.js