Updates CSS, adds some JS for main.html
removes website.html
Merge pull request #2 from markableidinger/marksBranch2

Marks branch2