Updated CSS/HTML
Merge branch 'gh-pages'