Fixed frmMain Designer
Fixed comboEditMethod lists
something Bill did...
Merge remote-tracking branch 'origin/Kris14'

Conflicts:
	CIS411_Kris/db.mdf
	CIS411_Kris/db_log.ldf
12/3

spacing, deleting and such
Merge remote-tracking branch 'origin/Matt21'

Conflicts:
	CIS411_Kris/db.mdf
	CIS411_Kris/db_log.ldf