windows
Merge branch 'master' of https://github.com/Revetice/read-the-docs

Conflicts:
	index.rst
	javascript/javascript.rst