test2...
Merge branch 'master' of https://github.com/cmdhema/KJW_readthedocstest

Conflicts:
	docs/source/index.rst