initial commit
Merge branch 'master' into static-html
local merge to combine master with styles to date