HTML file
Images & CSS file
Merge branch 'master' into gh-pages