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

Conflicts:
	WindowsClient/SDM.WinClient/SDM.WinClient/Form1.Designer.cs
	WindowsClient/SDM.WinClient/SDM.WinClient/Form1.resx
	WindowsClient/SDM.WinClient/SDM.WinClient/Program.cs
	WindowsClient/SDM.WinClient/SDM.WinClient/Properties/licenses.licx
	WindowsClient/SDM.WinClient/SDM.WinClient/SDM.WinClient.csproj