refactored by moving controller logic into models for subject and grade action
resolved conflicts to pull fresh copy to local master