Updated web.js
cecking index
Merge branch 'master' of heroku.com:aqueous-escarpment-3217

Conflicts:
	web.js