Update doc to include Windows and Linux
Merge branch 'new_doc'

Conflicts:
	package.json