styled front page
fixed merge errors
Merge pull request #16 from belindahare/master

styled front page
changed layout welcome