s
Merge branch 'master' of https://github.com/CoryAlice93/SofeWareDesignMatch

Conflicts:
	WindowsClient/SDM.WinClient/SDM.WinClient/Frm_Main.Designer.cs
	WindowsClient/SDM.WinClient/SDM.WinClient/Frm_Main.cs
	WindowsClient/SDM.WinClient/SDM.WinClient/SDM.WinClient.csproj