no update for students from class grades file
Merge origin/master
better code structure
Merge origin/master