add subjects to class and marks to students
fixing merge conflicts
merge conflict