Readme update
Docs update
Readme update
Readme updated
Readme updated
Docs update
Docs updated
Merge branch 'master' into gh-pages

Conflicts:
	Readme.md
	Readme.rst
	_sources/index.txt
	docs/index.rst