coflict resolve mistake corrected
subject Masters controller Creted
Section Master Controller Created
alerts removed
Merge branch 'master', remote-tracking branch 'origin'
active process link
Teacher leader index
Staffrecruits Indexes
removal of <<<< in attendance.js
Grade Sections AND Grade Subjects Mapping
conflict resove
Merge remote-tracking branch 'origin/academics_changes'