cambio 2
Now we have index
web.js reads index.html
Correct error
Right phrase in index.html
HTML wireframe
typo check
typo check
Merge branch 'master' of heroku.com:guarded-hamlet-6186

Conflicts:
	index.html
More typos
more typos