Clarify instructions for windows users
Merge branch 'master' of https://github.com/gdevenyi/website

Conflicts:
	setup/windows.html