change hello world line
add index.html
read from index.html
say hello from index.html
Merge branch 'master' of heroku.com:cram1010-bitstarter

Conflicts:
	web.js