changed welcome text
changed web.js to use index.html
changed web.js to use index.html
using index.html
removed conflict markers form rebase
Added initial layout in index.html file