Resolve merge conflicts.

README.md

docs/source/about.rst

docs/source/conf.py

docs/source/dependencies.rst

docs/source/modules.rst

docs/source/readme_link.md

docs/source/readme_link.rst

docs/source/structure.rst

plotid/publish.py