Face
Merge branch 'master' of https://github.com/tsmairc/winform

Conflicts:
	WindowsFormsApplication2/WindowsFormsApplication2/Form1.cs
	WindowsFormsApplication2/WindowsFormsApplication2/Form3.cs
	WindowsFormsApplication2/WindowsFormsApplication2/LoginFace.cs
	WindowsFormsApplication2/WindowsFormsApplication2/MainFace.cs