creating initial structure
first draft html/css
Update index.html
css changes
conflict resolved
more css
Merge pull request #1 from Code-Crunch/marina

Main page html/css finished