Added Windows
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Some Stuff
Merge remote-tracking branch 'upstream/master' into CorrectBranch
Merge pull request #27 from JakobKlinger/final_index

Final index