Updated web.hs
Merge remote-tracking branch 'upstream/master'
add index.html
Merge remote-tracking branch 'upstream/master'