finish chp06 exercise
Merge branch 'master' into gh-pages
update page