Updates web.js
Updated web.js
Updated web.js
Added index.html
Updated web.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	web.js