basic front page
resolve merge conflicts for welcome.js
Merge pull request #9 from rjbernaldo/basicindexpage

basic front page