Fixed Conflicts
Fixed Conflicts
Added Combo Class To Project
Merge remote-tracking branch 'origin/master' into Randy
Added Employee Class and Test main; Fixed Schedule

Added Employee Class and Test main to subfolder. Fixed schedule operator
overload for =.
Added files to project

Check, Employee, and Inventory added to project file.