Update windows.html
Merge branch 'master' of https://github.com/jakerob/windows
Merge branch 'master' into gh-pages