Updated web.js
Updated web.js
Updated web.js
Added index.html
Merge branch 'master' of heroku.com:secret-citadel-4234

Conflicts:
	web.js
Updated web.js