lab5main.cpp needs only magic numbers removed. All other things have been taken care of.
Fixed merging problems. Kept my changes for lab5main.cpp and kept Terry's changes for lab5test.cpp.