Add
Merge branch 'master' of https://github.com/guiguifelin/PolySoft

Conflicts:
	PolySoft/Form1.Designer.cs