Updates web.js
Update web.js to read from index.html
Update web.js to read from index.html
Update web.js
Merge branch 'master' of heroku.com:whispering-inlet-1006

Conflicts:
	web.js