Fixed graphing of math/reading SS
Fixed merge conflicts