updates
Merge branch 'gh-pages' of github.com:hplgit/doconce
merge