fix merge conflict and Add Washington grade level knots and bounds for EOCT subjects
Merge pull request #460 from adamvi/master

fix merge conflict and Add Washington grade level knots and bounds for E...