styles and pictures apr9
Merge branch 'master' into gh-pages