Merge branch 'master' into work
modify css
add h2 caption
add section tags
add link to footer
Merge branch 'work'