forward slashes for image paths
Merge branch 'master' into gh-pages

merge