added .nojekyll to build_docs.sh
updated docs html build.
merged conflicts
docs update.
updated docs.