添加win程序�
Merge remote-tracking branch 'origin/master'

Conflicts:
	dou2.py