added on windows

hello
Merge remote-tracking branch 'origin/master'

Conflicts:
	note.txt
finish