update studentgenerator and student
Merge remote-tracking branch 'origin/master' into Brian-Branch