css changes
Merge branch 'MacEdits1' into gh-pages