class teacher
issues in canteen
Merge remote-tracking branch 'origin/academics_changes'
Merge remote-tracking branch 'origin/attendance'
conflict resolve
Merge branch 'master', remote-tracking branch 'origin'
data exist