just to make it shut up...
Merge remote-tracking branch 'origin/master'

Conflicts:
	GradeACatering/frmNewSearch.cs.orig
NewSearch form has functioning filters (though have not implemented the and/or toggle).  Have added some basic error checking to make sure numeric values for quantity and price do not crash the program.