Stumbled a little.
Maybe I should take this a bit more seriously and test before rushing to commit.
Merge branch 'master' of heroku.com:mighty-oasis-1902

Conflicts:
	web.js
Getting the hang of this. I think.
Minor fix.
Updated index.html conten to match assignment.