modify code
Merge branch 'master' of https://github.com/Kimi-Qu/WinApp

Conflicts:
	WindowsFormsApplication/Form1.cs
merge
modify code

modify code