Show index.html
Show index.html
Merge branch 'master' of heroku.com:afternoon-meadow-6311

Conflicts:
	web.js