none too important
Merge remote-tracking branch 'origin/Kris8'

Conflicts:
	CIS411_Kris/frmAdmin.Designer.cs
	CIS411_Kris/frmMain.cs
merge fixes